Skip to content

Commit

Permalink
MOM6: Merge branch 'main' into merge_main_20230405
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@fc823f5d7 Merge branch 'main' into merge_main_20230405
- NOAA-GFDL/MOM6@a6f813e05 (*)Fix MOM_calc_grad_Coriolis GLOBAL_INDEXING bug
- NOAA-GFDL/MOM6@1e54bed6a Merge pull request #1594 from NCAR/dev-ncar-main-candidate-2023-03-02
- NOAA-GFDL/MOM6@d1d53bcb4 remove inadvertent reassignment of layer_frac
- NOAA-GFDL/MOM6@ed93a232a  add SMOOTH_RI to MOM_obsolete_params.F90
- NOAA-GFDL/MOM6@774074ff9 minor styling fixes to address PR #1594 reviews.
- NOAA-GFDL/MOM6@9786710c3 Merge pull request #235 from mom-ocean/main
- NOAA-GFDL/MOM6@c142e4c39 Merge pull request #231 from jedwards4b/cesm_logging_improvements
- NOAA-GFDL/MOM6@4959ee12f update more write units to stdout in mom6 nuopc cap and let only rootpe write logs.
- NOAA-GFDL/MOM6@b693dd2d8 remove more direct calls to FMS in mom_cap.F90
- NOAA-GFDL/MOM6@1dce6df13 merge latest dev/ncar and resolve conflicts
- NOAA-GFDL/MOM6@5b274bbde Merge pull request #234 from alperaltuntas/fix_gnu_restart
- NOAA-GFDL/MOM6@0f1fc0386 fix gnu restart issue by removing leading spaces in restartfiles list
- NOAA-GFDL/MOM6@9d5d9bb40 Merge pull request #233 from marshallward/siglongjmp_name_fix
- NOAA-GFDL/MOM6@de8023d10 POSIX: siglongjmp and sigsetjmp_missing fixes
- NOAA-GFDL/MOM6@7f024685f Merge pull request #229 from gustavo-marques/merge_main_08Dec22
- NOAA-GFDL/MOM6@a789254e0 get the variable name correct
- NOAA-GFDL/MOM6@8bc69f67e further improvement to logunit setting
- NOAA-GFDL/MOM6@cac67d1e7 revert change to github action
- NOAA-GFDL/MOM6@12238ae21 remove whitespace
- NOAA-GFDL/MOM6@7824dcec7 switch to openmpi for github tests
- NOAA-GFDL/MOM6@a80b91ded use more cesm style logging
- NOAA-GFDL/MOM6@380864138 Switch from mpich to openmpi
- NOAA-GFDL/MOM6@ed252790d Merge branch 'dev/ncar' into main_08Dec22
- NOAA-GFDL/MOM6@1eb6be9c8 Merge pull request #222 from NCAR/willy_tracer
- NOAA-GFDL/MOM6@4840c6fdb Merge pull request #226 from gustavo-marques/fix_diags_docs
- NOAA-GFDL/MOM6@d5bd437b7 Merge pull request #225 from gustavo-marques/multiple_ri_smooth
- NOAA-GFDL/MOM6@0cf34d352 Fix string order in regional_section
- NOAA-GFDL/MOM6@b4440417c Adds option to smooth gradient Ri multiple times
- NOAA-GFDL/MOM6@09278521c Modify gradient Richarson number diagnostics
- NOAA-GFDL/MOM6@cfd7c0bde Rename parameter SMOOTH_RI to N_SMOOTH_RI
- NOAA-GFDL/MOM6@fe3cb4d69 Merge pull request #224 from gustavo-marques/merge-dev-gfdl-candidate-main-2022-08-10
- NOAA-GFDL/MOM6@36487d828 Merge branch 'main' into merge-dev-gfdl-candidate-main-2022-08-10
- NOAA-GFDL/MOM6@0b5cd6ff7 Merge pull request #223 from mom-ocean/main
- NOAA-GFDL/MOM6@dfb37154a Changed parameter reference for ideal_age_physics to Hbl=Hml
- NOAA-GFDL/MOM6@e300296ac Changed GV%nkbl back to GV%nkml
- NOAA-GFDL/MOM6@5ac624241 All references to "mixed layer" in the ideal age module now refer to "boundary layer" instead.
- NOAA-GFDL/MOM6@0d86acd52 Shortened line length to make dOxygen happy
- NOAA-GFDL/MOM6@2428684ac !! ---->  !<
- NOAA-GFDL/MOM6@f415a7f5c Shortens a line and removes whitespace
- NOAA-GFDL/MOM6@bb02a51be A new tracer that keeps track of "mixed layer age" has been added to the ideal age module. This PR also adds the ability to use the actual BL depth that is diagnosed by the active BL scheme inside the ideal age module (for all ideal age tracers).
- NOAA-GFDL/MOM6@d9ec82e4d Merge branch 'mom-ocean:main' into dev/ncar
- NOAA-GFDL/MOM6@605771423 Follow MOM6 code style guide
- NOAA-GFDL/MOM6@8e833d4d9 Add missing units
  • Loading branch information
@marshallward
marshallward committed Apr 6, 2023
1 parent 3b2341c commit 387ddb5
Show file tree
Hide file tree
Showing 19 changed files with 181 additions and 73 deletions.
14 changes: 10 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 @@ -381,16 +381,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 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 @@ -381,16 +381,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 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 @@ -381,16 +381,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 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 @@ -381,16 +381,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 additions & 4 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 @@ -404,16 +404,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 additions & 4 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 @@ -412,16 +412,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 additions & 4 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 @@ -412,16 +412,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 additions & 4 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,16 +412,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
14 changes: 10 additions & 4 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,16 +412,22 @@ USE_NW2_TRACERS = False ! [Boolean] default = False

! === module ideal_age_example ===
DO_IDEAL_AGE = True ! [Boolean] default = True
! If true, use an ideal age tracer that is set to 0 age in the mixed layer and
! ages at unit rate in the interior.
! If true, use an ideal age tracer that is set to 0 age in the boundary layer
! and ages at unit rate in the interior.
DO_IDEAL_VINTAGE = False ! [Boolean] default = False
! If true, use an ideal vintage tracer that is set to an exponentially
! increasing value in the mixed layer and is conserved thereafter.
! increasing value in the boundary layer and is conserved thereafter.
DO_IDEAL_AGE_DATED = False ! [Boolean] default = False
! If true, use an ideal age tracer that is everywhere 0 before
! IDEAL_AGE_DATED_START_YEAR, but the behaves like the standard ideal age tracer
! - i.e. is set to 0 age in the mixed layer and ages at unit rate in the
! - i.e. is set to 0 age in the boundary layer and ages at unit rate in the
! interior.
DO_BL_RESIDENCE = False ! [Boolean] default = False
! If true, use a residence tracer that is set to 0 age in the interior and ages
! at unit rate in the boundary layer.
USE_REAL_BL_DEPTH = False ! [Boolean] default = False
! If true, the ideal age tracers will use the boundary layer depth diagnosed
! from the BL or bulkmixedlayer scheme.
AGE_IC_FILE = "" ! default = ""
! The file in which the age-tracer initial values can be found, or an empty
! string for internal initialization.
Expand Down
Loading

0 comments on commit 387ddb5

Please sign in to comment.