Skip to content

Commit

Permalink
MOM6: +Convective adjustment outside regridding_main
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@28ff86e4e +Convective adjustment outside regridding_main
- NOAA-GFDL/MOM6@fd2060cda +Add Hybgen regridding
  • Loading branch information
marshallward committed Apr 9, 2022
1 parent 7da4f43 commit 2e808c2
Show file tree
Hide file tree
Showing 67 changed files with 67 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
ALE_COORDINATE_CONFIG = "FILE:vgrid.nc,dz" ! default = "UNIFORM"
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
1 change: 1 addition & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 400*1.0 ! [m]
Expand Down
1 change: 1 addition & 0 deletions ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
1 change: 1 addition & 0 deletions ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
!ALE_RESOLUTION = 600*0.5 ! [m]
Expand Down
1 change: 1 addition & 0 deletions ocean_only/adjustment2d/rho/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "kg m^-3" ! default = "kg m^-3"
Expand Down
1 change: 1 addition & 0 deletions ocean_only/adjustment2d/rho/MOM_parameter_doc.short
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
INTERPOLATION_SCHEME = "P3M_IH4IH3" ! default = "P1M_H2"
Expand Down
1 change: 1 addition & 0 deletions ocean_only/adjustment2d/z/MOM_parameter_doc.all
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER"
! SIGMA - terrain following coordinates
! RHO - continuous isopycnal
! HYCOM1 - HyCOM-like hybrid coordinate
! HYBGEN - Hybrid coordinate from the Hycom hybgen code
! SLIGHT - stretched coordinates above continuous isopycnal
! ADAPTIVE - optimize for smooth neutral density surfaces
REGRIDDING_COORDINATE_UNITS = "m" ! default = "m"
Expand Down
Loading

0 comments on commit 2e808c2

Please sign in to comment.