Skip to content

Commit 1c232c8

Browse files
marshallwardmarshallward
committed
MOM6: (*)Use dz_to_thickness in 4 user modules
- 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
1 parent 53fae2e commit 1c232c8

94 files changed

Lines changed: 366 additions & 376 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
621621
! rossby_front - a mixed layer front in thermal wind balance.
622622
! soliton - Equatorial Rossby soliton.
623623
! USER - call a user modified routine.
624-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
625-
! If true, convert the thickness initial conditions from units of m to kg m-2
626-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
627-
! if a restart file is read.
628624
ODA_INCUPD = False ! [Boolean] default = False
629625
! If true, oda incremental updates will be applied everywhere in the domain.
630626
SPONGE = False ! [Boolean] default = False

‎coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
621621
! rossby_front - a mixed layer front in thermal wind balance.
622622
! soliton - Equatorial Rossby soliton.
623623
! USER - call a user modified routine.
624-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
625-
! If true, convert the thickness initial conditions from units of m to kg m-2
626-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
627-
! if a restart file is read.
628624
ODA_INCUPD = False ! [Boolean] default = False
629625
! If true, oda incremental updates will be applied everywhere in the domain.
630626
SPONGE = False ! [Boolean] default = False

‎coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
621621
! rossby_front - a mixed layer front in thermal wind balance.
622622
! soliton - Equatorial Rossby soliton.
623623
! USER - call a user modified routine.
624-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
625-
! If true, convert the thickness initial conditions from units of m to kg m-2
626-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
627-
! if a restart file is read.
628624
ODA_INCUPD = False ! [Boolean] default = False
629625
! If true, oda incremental updates will be applied everywhere in the domain.
630626
SPONGE = False ! [Boolean] default = False

‎ice_ocean_SIS2/Baltic/MOM_parameter_doc.all‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
621621
! rossby_front - a mixed layer front in thermal wind balance.
622622
! soliton - Equatorial Rossby soliton.
623623
! USER - call a user modified routine.
624-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
625-
! If true, convert the thickness initial conditions from units of m to kg m-2
626-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
627-
! if a restart file is read.
628624
ODA_INCUPD = False ! [Boolean] default = False
629625
! If true, oda incremental updates will be applied everywhere in the domain.
630626
SPONGE = False ! [Boolean] default = False

‎ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
658658
! If true, cuts way the top of the column for initial conditions at the depth
659659
! where the hydrostatic pressure matches the imposed surface pressure which is
660660
! read from file.
661+
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
662+
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
663+
! algorithm to push the initial grid to be consistent with the initial
664+
! condition. Useful only for state-based and iterative coordinates.
661665
VELOCITY_CONFIG = "zero" ! default = "zero"
662666
! A string that determines how the initial velocities are specified for a new
663667
! run:
@@ -669,14 +673,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
669673
! rossby_front - a mixed layer front in thermal wind balance.
670674
! soliton - Equatorial Rossby soliton.
671675
! USER - call a user modified routine.
672-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
673-
! If true, convert the thickness initial conditions from units of m to kg m-2
674-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
675-
! if a restart file is read.
676-
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
677-
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
678-
! algorithm to push the initial grid to be consistent with the initial
679-
! condition. Useful only for state-based and iterative coordinates.
680676
ODA_INCUPD = False ! [Boolean] default = False
681677
! If true, oda incremental updates will be applied everywhere in the domain.
682678

‎ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
700700
! If true, cuts way the top of the column for initial conditions at the depth
701701
! where the hydrostatic pressure matches the imposed surface pressure which is
702702
! read from file.
703+
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
704+
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
705+
! algorithm to push the initial grid to be consistent with the initial
706+
! condition. Useful only for state-based and iterative coordinates.
703707
VELOCITY_CONFIG = "zero" ! default = "zero"
704708
! A string that determines how the initial velocities are specified for a new
705709
! run:
@@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
711715
! rossby_front - a mixed layer front in thermal wind balance.
712716
! soliton - Equatorial Rossby soliton.
713717
! USER - call a user modified routine.
714-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
715-
! If true, convert the thickness initial conditions from units of m to kg m-2
716-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
717-
! if a restart file is read.
718-
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
719-
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
720-
! algorithm to push the initial grid to be consistent with the initial
721-
! condition. Useful only for state-based and iterative coordinates.
722718
ODA_INCUPD = False ! [Boolean] default = False
723719
! If true, oda incremental updates will be applied everywhere in the domain.
724720
SPONGE = False ! [Boolean] default = False

‎ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
700700
! If true, cuts way the top of the column for initial conditions at the depth
701701
! where the hydrostatic pressure matches the imposed surface pressure which is
702702
! read from file.
703+
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
704+
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
705+
! algorithm to push the initial grid to be consistent with the initial
706+
! condition. Useful only for state-based and iterative coordinates.
703707
VELOCITY_CONFIG = "zero" ! default = "zero"
704708
! A string that determines how the initial velocities are specified for a new
705709
! run:
@@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
711715
! rossby_front - a mixed layer front in thermal wind balance.
712716
! soliton - Equatorial Rossby soliton.
713717
! USER - call a user modified routine.
714-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
715-
! If true, convert the thickness initial conditions from units of m to kg m-2
716-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
717-
! if a restart file is read.
718-
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
719-
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
720-
! algorithm to push the initial grid to be consistent with the initial
721-
! condition. Useful only for state-based and iterative coordinates.
722718
ODA_INCUPD = False ! [Boolean] default = False
723719
! If true, oda incremental updates will be applied everywhere in the domain.
724720
SPONGE = False ! [Boolean] default = False

‎ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
700700
! If true, cuts way the top of the column for initial conditions at the depth
701701
! where the hydrostatic pressure matches the imposed surface pressure which is
702702
! read from file.
703+
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
704+
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
705+
! algorithm to push the initial grid to be consistent with the initial
706+
! condition. Useful only for state-based and iterative coordinates.
703707
VELOCITY_CONFIG = "zero" ! default = "zero"
704708
! A string that determines how the initial velocities are specified for a new
705709
! run:
@@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
711715
! rossby_front - a mixed layer front in thermal wind balance.
712716
! soliton - Equatorial Rossby soliton.
713717
! USER - call a user modified routine.
714-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
715-
! If true, convert the thickness initial conditions from units of m to kg m-2
716-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
717-
! if a restart file is read.
718-
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
719-
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
720-
! algorithm to push the initial grid to be consistent with the initial
721-
! condition. Useful only for state-based and iterative coordinates.
722718
ODA_INCUPD = False ! [Boolean] default = False
723719
! If true, oda incremental updates will be applied everywhere in the domain.
724720
SPONGE = False ! [Boolean] default = False

‎ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
700700
! If true, cuts way the top of the column for initial conditions at the depth
701701
! where the hydrostatic pressure matches the imposed surface pressure which is
702702
! read from file.
703+
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
704+
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
705+
! algorithm to push the initial grid to be consistent with the initial
706+
! condition. Useful only for state-based and iterative coordinates.
703707
VELOCITY_CONFIG = "zero" ! default = "zero"
704708
! A string that determines how the initial velocities are specified for a new
705709
! run:
@@ -711,14 +715,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
711715
! rossby_front - a mixed layer front in thermal wind balance.
712716
! soliton - Equatorial Rossby soliton.
713717
! USER - call a user modified routine.
714-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
715-
! If true, convert the thickness initial conditions from units of m to kg m-2
716-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
717-
! if a restart file is read.
718-
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
719-
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
720-
! algorithm to push the initial grid to be consistent with the initial
721-
! condition. Useful only for state-based and iterative coordinates.
722718
ODA_INCUPD = False ! [Boolean] default = False
723719
! If true, oda incremental updates will be applied everywhere in the domain.
724720
SPONGE = False ! [Boolean] default = False

‎ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,10 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False
691691
! If true, cuts way the top of the column for initial conditions at the depth
692692
! where the hydrostatic pressure matches the imposed surface pressure which is
693693
! read from file.
694+
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
695+
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
696+
! algorithm to push the initial grid to be consistent with the initial
697+
! condition. Useful only for state-based and iterative coordinates.
694698
VELOCITY_CONFIG = "zero" ! default = "zero"
695699
! A string that determines how the initial velocities are specified for a new
696700
! run:
@@ -702,14 +706,6 @@ VELOCITY_CONFIG = "zero" ! default = "zero"
702706
! rossby_front - a mixed layer front in thermal wind balance.
703707
! soliton - Equatorial Rossby soliton.
704708
! USER - call a user modified routine.
705-
CONVERT_THICKNESS_UNITS = False ! [Boolean] default = False
706-
! If true, convert the thickness initial conditions from units of m to kg m-2
707-
! or vice versa, depending on whether BOUSSINESQ is defined. This does not apply
708-
! if a restart file is read.
709-
REGRID_ACCELERATE_INIT = False ! [Boolean] default = False
710-
! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding
711-
! algorithm to push the initial grid to be consistent with the initial
712-
! condition. Useful only for state-based and iterative coordinates.
713709
ODA_INCUPD = False ! [Boolean] default = False
714710
! If true, oda incremental updates will be applied everywhere in the domain.
715711
SPONGE = False ! [Boolean] default = False

0 commit comments

Comments
 (0)
⚡