Skip to content

Commit 3f17d14

Browse files
adcroftadcroft
committed
MOM6: Merge branch 'dev/master' into dev/gfdl
- Updates MOM_parameter_doc files. - NOAA-GFDL/MOM6@cde6d3f Merge branch 'dev/master' into dev/gfdl - NOAA-GFDL/MOM6@ae22a0f Merge pull request mom-ocean#578 from NCAR/dev/ncar - NOAA-GFDL/MOM6@f4f882f Merge pull request mom-ocean#23 from gustavo-marques/combine_mct_modules - NOAA-GFDL/MOM6@a85b728 Merge MCT modules - NOAA-GFDL/MOM6@ba5b5ba Merge pull request mom-ocean#22 from gustavo-marques/check_fluxes - NOAA-GFDL/MOM6@f5a8483 Adds option to write restart files - NOAA-GFDL/MOM6@8745b4b Fills additional IOB fluxes - NOAA-GFDL/MOM6@f6b22ff Merge branch 'dev/ncar' into check_fluxes - NOAA-GFDL/MOM6@369d5d6 Merge pull request mom-ocean#21 from alperaltuntas/dev/ncar - NOAA-GFDL/MOM6@2582e0a Adds run paramaters to control SW decomposition - NOAA-GFDL/MOM6@58f78b9 Fill IOB, some fluxes still need to be checked - NOAA-GFDL/MOM6@06a30ab Fixed clock and timing - NOAA-GFDL/MOM6@1bca79b Merge pull request mom-ocean#20 from gustavo-marques/fix_merge - NOAA-GFDL/MOM6@fb89b08 Adds code that got lost during merge - NOAA-GFDL/MOM6@7480492 Merge pull request mom-ocean#19 from gustavo-marques/new_merge - NOAA-GFDL/MOM6@be1e6cf Merge branch 'dev/master' into dev/ncar - NOAA-GFDL/MOM6@76565cb Merge pull request mom-ocean#17 from gustavo-marques/fix_ssh_slopes - NOAA-GFDL/MOM6@c04f081 Fix ssh slope calculation - NOAA-GFDL/MOM6@17d4586 Merge pull request mom-ocean#16 from adcroft/ncar-cherry-picked-fixes - NOAA-GFDL/MOM6@be46fee (*)Fixes gprime(1) when no layer coordinates are set - NOAA-GFDL/MOM6@fccb7ae Avoids a SEGV when OBC are not in use with bi-harmonic friction - NOAA-GFDL/MOM6@f42c970 Merge pull request mom-ocean#15 from gustavo-marques/small_fixes - NOAA-GFDL/MOM6@31787c2 Adds reference to set_time that was lost during a conflict handling - NOAA-GFDL/MOM6@d77936e Fix intent(inout) in ice_ocean_boundary - NOAA-GFDL/MOM6@b403edd Merge pull request mom-ocean#14 from gustavo-marques/docs - NOAA-GFDL/MOM6@4d346ca Merge branch 'dev/ncar' into docs - NOAA-GFDL/MOM6@f7c26a5 Clean the module and start doxygenizing it - NOAA-GFDL/MOM6@cd58e2a Merge pull request mom-ocean#13 from alperaltuntas/dev/ncar - NOAA-GFDL/MOM6@37a53bc reorganize file structure - NOAA-GFDL/MOM6@e6c5ddd Merge pull request mom-ocean#12 from gustavo-marques/fill_ice_ocean_bnd - NOAA-GFDL/MOM6@6b6289a Remove trailing whitespace - NOAA-GFDL/MOM6@7ce40e5 Fix undefined reference to fill_ice_ocean_bnd - NOAA-GFDL/MOM6@d517719 Merge branch 'dev/ncar' into fill_ice_ocean_bnd - NOAA-GFDL/MOM6@b69ab33 Filling ice_ocean_bnd - Draft - NOAA-GFDL/MOM6@a306c90 Merge pull request mom-ocean#11 from adcroft/use-ocn-public-for-surface - NOAA-GFDL/MOM6@c83e238 Correct indexing when using ocean_public_type - NOAA-GFDL/MOM6@1f39c84 Replaces use of "surface" with "ocean_public_type" - NOAA-GFDL/MOM6@5cd8d7a Filling ice_ocean_bnd, still needs work - NOAA-GFDL/MOM6@3ceef26 Merge pull request mom-ocean#10 from adcroft/sketch-out-mct-run - NOAA-GFDL/MOM6@714e8d6 Adds placeholders for stepping foward MOM - NOAA-GFDL/MOM6@7f2207c Merge pull request #7 from adcroft/fix-mct-whitespace - NOAA-GFDL/MOM6@a1db77f Cleans up white space - NOAA-GFDL/MOM6@5700d67 Merge pull request #6 from adcroft/add-use-only-for-imports - NOAA-GFDL/MOM6@beac3ed Adds "only" for all use statements - NOAA-GFDL/MOM6@231d19e Merge pull request #5 from alperaltuntas/dev/ncar - NOAA-GFDL/MOM6@3a923a2 Got initialization working - NOAA-GFDL/MOM6@8b38141 Wrapped global data - NOAA-GFDL/MOM6@970f848 added debugging - NOAA-GFDL/MOM6@2540ed8 Filled empty subroutines in ocn_comp_mct.F90 - NOAA-GFDL/MOM6@ed3ed30 Added ocn_import_export module - NOAA-GFDL/MOM6@aba7dc2 Completed ocn_init_mct - NOAA-GFDL/MOM6@5df3bc3 Added method to point ponters to members of ocean_state_type - NOAA-GFDL/MOM6@57e6086 Added methods to return domain/grid shape - NOAA-GFDL/MOM6@37e7356 Added ocn_import_export.F90 - NOAA-GFDL/MOM6@2b794da Merge pull request #4 from alperaltuntas/dev/ncar - NOAA-GFDL/MOM6@fbd405b Added coupler indices module - NOAA-GFDL/MOM6@fa86163 Merge pull request #3 from NCAR/dev/gfdl - NOAA-GFDL/MOM6@e8f2999 Merge pull request #2 from gustavo-marques/temp_salt_z_init_file - NOAA-GFDL/MOM6@86936ba Adds option to read initial temp and salt from separate files - NOAA-GFDL/MOM6@54f7976 Most initialization working - NOAA-GFDL/MOM6@426357c Time and calendar initialization in ocn_comp_mct.F90 - NOAA-GFDL/MOM6@346097d Moved blank ocn_comp_mct.F90 - NOAA-GFDL/MOM6@405fecb Merge pull request #1 from gustavo-marques/ice_shelf - NOAA-GFDL/MOM6@711a613 Removes frazil's contribution to evaporation
1 parent ea9c5e8 commit 3f17d14

29 files changed

Lines changed: 225 additions & 85 deletions

‎coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
461461
! === module MOM_initialize_layers_from_Z ===
462462
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
463463
! The name of the z-space input file used to initialize
464-
! the layer thicknesses, temperatures and salinities.
464+
! temperatures (T) and salinities (S). If T and S are not
465+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
466+
! must be set.
467+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
468+
! The name of the z-space input file used to initialize
469+
! temperatures, only.
470+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
471+
! The name of the z-space input file used to initialize
472+
! temperatures, only.
465473
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
466474
! The name of the potential temperature variable in
467-
! TEMP_SALT_Z_INIT_FILE.
475+
! TEMP_Z_INIT_FILE.
468476
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
469477
! The name of the salinity variable in
470-
! TEMP_SALT_Z_INIT_FILE.
478+
! SALT_Z_INIT_FILE.
471479
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
472480
! If True, then horizontally homogenize the interpolated
473481
! initial conditions.

‎coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
184184
! === module MOM_initialize_layers_from_Z ===
185185
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
186186
! The name of the z-space input file used to initialize
187-
! the layer thicknesses, temperatures and salinities.
187+
! temperatures (T) and salinities (S). If T and S are not
188+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
189+
! must be set.
188190
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
189191
! The name of the potential temperature variable in
190-
! TEMP_SALT_Z_INIT_FILE.
192+
! TEMP_Z_INIT_FILE.
191193
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
192194
! The name of the salinity variable in
193-
! TEMP_SALT_Z_INIT_FILE.
195+
! SALT_Z_INIT_FILE.
194196
ADJUST_THICKNESS = True ! [Boolean] default = False
195197
! If true, all mass below the bottom removed if the
196198
! topography is shallower than the thickness input file

‎coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
461461
! === module MOM_initialize_layers_from_Z ===
462462
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
463463
! The name of the z-space input file used to initialize
464-
! the layer thicknesses, temperatures and salinities.
464+
! temperatures (T) and salinities (S). If T and S are not
465+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
466+
! must be set.
467+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
468+
! The name of the z-space input file used to initialize
469+
! temperatures, only.
470+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
471+
! The name of the z-space input file used to initialize
472+
! temperatures, only.
465473
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
466474
! The name of the potential temperature variable in
467-
! TEMP_SALT_Z_INIT_FILE.
475+
! TEMP_Z_INIT_FILE.
468476
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
469477
! The name of the salinity variable in
470-
! TEMP_SALT_Z_INIT_FILE.
478+
! SALT_Z_INIT_FILE.
471479
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
472480
! If True, then horizontally homogenize the interpolated
473481
! initial conditions.

‎coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
187187
! === module MOM_initialize_layers_from_Z ===
188188
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
189189
! The name of the z-space input file used to initialize
190-
! the layer thicknesses, temperatures and salinities.
190+
! temperatures (T) and salinities (S). If T and S are not
191+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
192+
! must be set.
191193
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
192194
! The name of the potential temperature variable in
193-
! TEMP_SALT_Z_INIT_FILE.
195+
! TEMP_Z_INIT_FILE.
194196
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
195197
! The name of the salinity variable in
196-
! TEMP_SALT_Z_INIT_FILE.
198+
! SALT_Z_INIT_FILE.
197199
ADJUST_THICKNESS = True ! [Boolean] default = False
198200
! If true, all mass below the bottom removed if the
199201
! topography is shallower than the thickness input file

‎coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
461461
! === module MOM_initialize_layers_from_Z ===
462462
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
463463
! The name of the z-space input file used to initialize
464-
! the layer thicknesses, temperatures and salinities.
464+
! temperatures (T) and salinities (S). If T and S are not
465+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
466+
! must be set.
467+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
468+
! The name of the z-space input file used to initialize
469+
! temperatures, only.
470+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
471+
! The name of the z-space input file used to initialize
472+
! temperatures, only.
465473
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
466474
! The name of the potential temperature variable in
467-
! TEMP_SALT_Z_INIT_FILE.
475+
! TEMP_Z_INIT_FILE.
468476
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
469477
! The name of the salinity variable in
470-
! TEMP_SALT_Z_INIT_FILE.
478+
! SALT_Z_INIT_FILE.
471479
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
472480
! If True, then horizontally homogenize the interpolated
473481
! initial conditions.

‎coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
187187
! === module MOM_initialize_layers_from_Z ===
188188
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
189189
! The name of the z-space input file used to initialize
190-
! the layer thicknesses, temperatures and salinities.
190+
! temperatures (T) and salinities (S). If T and S are not
191+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
192+
! must be set.
191193
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
192194
! The name of the potential temperature variable in
193-
! TEMP_SALT_Z_INIT_FILE.
195+
! TEMP_Z_INIT_FILE.
194196
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
195197
! The name of the salinity variable in
196-
! TEMP_SALT_Z_INIT_FILE.
198+
! SALT_Z_INIT_FILE.
197199
ADJUST_THICKNESS = True ! [Boolean] default = False
198200
! If true, all mass below the bottom removed if the
199201
! topography is shallower than the thickness input file

‎ice_ocean_SIS2/Baltic/MOM_parameter_doc.all‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
461461
! === module MOM_initialize_layers_from_Z ===
462462
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
463463
! The name of the z-space input file used to initialize
464-
! the layer thicknesses, temperatures and salinities.
464+
! temperatures (T) and salinities (S). If T and S are not
465+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
466+
! must be set.
467+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
468+
! The name of the z-space input file used to initialize
469+
! temperatures, only.
470+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
471+
! The name of the z-space input file used to initialize
472+
! temperatures, only.
465473
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
466474
! The name of the potential temperature variable in
467-
! TEMP_SALT_Z_INIT_FILE.
475+
! TEMP_Z_INIT_FILE.
468476
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
469477
! The name of the salinity variable in
470-
! TEMP_SALT_Z_INIT_FILE.
478+
! SALT_Z_INIT_FILE.
471479
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
472480
! If True, then horizontally homogenize the interpolated
473481
! initial conditions.

‎ice_ocean_SIS2/Baltic/MOM_parameter_doc.short‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
184184
! === module MOM_initialize_layers_from_Z ===
185185
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
186186
! The name of the z-space input file used to initialize
187-
! the layer thicknesses, temperatures and salinities.
187+
! temperatures (T) and salinities (S). If T and S are not
188+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
189+
! must be set.
188190
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
189191
! The name of the potential temperature variable in
190-
! TEMP_SALT_Z_INIT_FILE.
192+
! TEMP_Z_INIT_FILE.
191193
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
192194
! The name of the salinity variable in
193-
! TEMP_SALT_Z_INIT_FILE.
195+
! SALT_Z_INIT_FILE.
194196
ADJUST_THICKNESS = True ! [Boolean] default = False
195197
! If true, all mass below the bottom removed if the
196198
! topography is shallower than the thickness input file

‎ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,13 +542,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
542542
! === module MOM_initialize_layers_from_Z ===
543543
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
544544
! The name of the z-space input file used to initialize
545-
! the layer thicknesses, temperatures and salinities.
545+
! temperatures (T) and salinities (S). If T and S are not
546+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
547+
! must be set.
548+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
549+
! The name of the z-space input file used to initialize
550+
! temperatures, only.
551+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
552+
! The name of the z-space input file used to initialize
553+
! temperatures, only.
546554
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
547555
! The name of the potential temperature variable in
548-
! TEMP_SALT_Z_INIT_FILE.
556+
! TEMP_Z_INIT_FILE.
549557
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
550558
! The name of the salinity variable in
551-
! TEMP_SALT_Z_INIT_FILE.
559+
! SALT_Z_INIT_FILE.
552560
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
553561
! If True, then horizontally homogenize the interpolated
554562
! initial conditions.

‎ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
239239
! === module MOM_initialize_layers_from_Z ===
240240
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
241241
! The name of the z-space input file used to initialize
242-
! the layer thicknesses, temperatures and salinities.
242+
! temperatures (T) and salinities (S). If T and S are not
243+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
244+
! must be set.
243245
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
244246
! The name of the potential temperature variable in
245-
! TEMP_SALT_Z_INIT_FILE.
247+
! TEMP_Z_INIT_FILE.
246248
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
247249
! The name of the salinity variable in
248-
! TEMP_SALT_Z_INIT_FILE.
250+
! SALT_Z_INIT_FILE.
249251
Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False
250252
! If True, then remap straight to model coordinate from file.
251253

0 commit comments

Comments
 (0)
⚡