Skip to content

Commit

Permalink
MOM6: (*)Use dz_to_thickness in 4 user modules
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@debe45e73 (*)Use dz_to_thickness in 4 user modules
- NOAA-GFDL/MOM6@fb5f4d7a6 (*)Improve non-Boussinesq initialization
- NOAA-GFDL/MOM6@3be5d3a9f +Add the new overloaded interface dz_to_thickness
- NOAA-GFDL/MOM6@3b11e430e +Initialize thicknesses in height units
- NOAA-GFDL/MOM6@82f750e58 +Remove optional argument eta_to_m from find_eta
- NOAA-GFDL/MOM6@ac11984fd Reversion of MOM_mixed_layer_restrat growth_time
- NOAA-GFDL/MOM6@f5423cb96 Add .nc extension to ALE Vertical_coordinate.
- NOAA-GFDL/MOM6@c9b920bb8 Remove FMS1 calls from MOM_domains_infra
- NOAA-GFDL/MOM6@63561c102 Removal of FMS1 I/O from FMS2 I/O infra

Removed from MOM_parameter_doc.all:
    - CONVERT_THICKNESS_UNITS
  • Loading branch information
@marshallward
marshallward committed May 25, 2023
1 parent 53fae2e commit aad0d22
Show file tree
Hide file tree
Showing 95 changed files with 367 additions and 377 deletions.
4 changes: 0 additions & 4 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
4 changes: 0 additions & 4 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
4 changes: 0 additions & 4 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
4 changes: 0 additions & 4 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
12 changes: 4 additions & 8 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
! If true, cuts way the top of the column for initial conditions at the depth
! where the hydrostatic pressure matches the imposed surface pressure which is
! read from file.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities are specified for a new
! run:
Expand All @@ -669,14 +673,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.

Expand Down
12 changes: 4 additions & 8 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
! If true, cuts way the top of the column for initial conditions at the depth
! where the hydrostatic pressure matches the imposed surface pressure which is
! read from file.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities are specified for a new
! run:
Expand All @@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
12 changes: 4 additions & 8 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
! If true, cuts way the top of the column for initial conditions at the depth
! where the hydrostatic pressure matches the imposed surface pressure which is
! read from file.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities are specified for a new
! run:
Expand All @@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
12 changes: 4 additions & 8 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
! If true, cuts way the top of the column for initial conditions at the depth
! where the hydrostatic pressure matches the imposed surface pressure which is
! read from file.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities are specified for a new
! run:
Expand All @@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
12 changes: 4 additions & 8 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
! If true, cuts way the top of the column for initial conditions at the depth
! where the hydrostatic pressure matches the imposed surface pressure which is
! read from file.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities are specified for a new
! run:
Expand All @@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
12 changes: 4 additions & 8 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
! If true, cuts way the top of the column for initial conditions at the depth
! where the hydrostatic pressure matches the imposed surface pressure which is
! read from file.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities are specified for a new
! run:
Expand All @@ -702,14 +706,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
! algorithm to push the initial grid to be consistent with the initial
! condition. Useful only for state-based and iterative coordinates.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
7 changes: 3 additions & 4 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,11 @@ THICKNESS_CONFIG = "file" ! default = "uniform"
! A string that determines how the initial layer thicknesses are specified for a
! new run:
! file - read interface heights from the file specified
! by (THICKNESS_FILE).
! thickness_file - read thicknesses from the file specified
! by (THICKNESS_FILE).
! mass_file - read thicknesses in units of mass per unit area from the file
! specified by (THICKNESS_FILE).
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
Expand Down Expand Up @@ -585,10 +588,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
! rossby_front - a mixed layer front in thermal wind balance.
! soliton - Equatorial Rossby soliton.
! USER - call a user modified routine.
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
! If true, convert the thickness initial conditions from units of m to kg m-2
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
! if a restart file is read.
ODA_INCUPD = False ! [Boolean] default = False
! If true, oda incremental updates will be applied everywhere in the domain.
SPONGE = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,11 @@ THICKNESS_CONFIG = "file" ! default = "uniform"
! A string that determines how the initial layer thicknesses are specified for a
! new run:
! file - read interface heights from the file specified
! by (THICKNESS_FILE).
! thickness_file - read thicknesses from the file specified
! by (THICKNESS_FILE).
! mass_file - read thicknesses in units of mass per unit area from the file
! specified by (THICKNESS_FILE).
! coord - determined by ALE coordinate.
! uniform - uniform thickness layers evenly distributed
! between the surface and MAXIMUM_DEPTH.
Expand Down
Loading

0 comments on commit aad0d22

Please sign in to comment.