Skip to content

Commit 8b801de

Browse files
adcroftadcroft
committed
MOM6: Merge pull request mom-ocean#578 from NCAR/dev/ncar
- 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 ed23886 commit 8b801de

119 files changed

Lines changed: 367 additions & 85 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_SIS/CM2G63L/MOM_parameter_doc.all‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05
424424
! === module MOM_coord_initialization ===
425425
COORD_CONFIG = "file" !
426426
! This specifies how layers are to be defined:
427+
! ALE or none - used to avoid defining layers in ALE mode
427428
! file - read coordinate information from the file
428429
! specified by (COORD_FILE).
429430
! BFB - Custom coords for buoyancy-forced basin case
@@ -459,13 +460,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
459460
! === module MOM_initialize_layers_from_Z ===
460461
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
461462
! The name of the z-space input file used to initialize
462-
! the layer thicknesses, temperatures and salinities.
463+
! temperatures (T) and salinities (S). If T and S are not
464+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
465+
! must be set.
466+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
467+
! The name of the z-space input file used to initialize
468+
! temperatures, only.
469+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
470+
! The name of the z-space input file used to initialize
471+
! temperatures, only.
463472
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
464473
! The name of the potential temperature variable in
465-
! TEMP_SALT_Z_INIT_FILE.
474+
! TEMP_Z_INIT_FILE.
466475
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
467476
! The name of the salinity variable in
468-
! TEMP_SALT_Z_INIT_FILE.
477+
! SALT_Z_INIT_FILE.
469478
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
470479
! If True, then horizontally homogenize the interpolated
471480
! initial conditions.

‎coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none"
152152
! === module MOM_coord_initialization ===
153153
COORD_CONFIG = "file" !
154154
! This specifies how layers are to be defined:
155+
! ALE or none - used to avoid defining layers in ALE mode
155156
! file - read coordinate information from the file
156157
! specified by (COORD_FILE).
157158
! BFB - Custom coords for buoyancy-forced basin case
@@ -182,13 +183,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
182183
! === module MOM_initialize_layers_from_Z ===
183184
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
184185
! The name of the z-space input file used to initialize
185-
! the layer thicknesses, temperatures and salinities.
186+
! temperatures (T) and salinities (S). If T and S are not
187+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
188+
! must be set.
186189
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
187190
! The name of the potential temperature variable in
188-
! TEMP_SALT_Z_INIT_FILE.
191+
! TEMP_Z_INIT_FILE.
189192
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
190193
! The name of the salinity variable in
191-
! TEMP_SALT_Z_INIT_FILE.
194+
! SALT_Z_INIT_FILE.
192195
ADJUST_THICKNESS = True ! [Boolean] default = False
193196
! If true, all mass below the bottom removed if the
194197
! topography is shallower than the thickness input file

‎coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05
424424
! === module MOM_coord_initialization ===
425425
COORD_CONFIG = "file" !
426426
! This specifies how layers are to be defined:
427+
! ALE or none - used to avoid defining layers in ALE mode
427428
! file - read coordinate information from the file
428429
! specified by (COORD_FILE).
429430
! BFB - Custom coords for buoyancy-forced basin case
@@ -459,13 +460,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
459460
! === module MOM_initialize_layers_from_Z ===
460461
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
461462
! The name of the z-space input file used to initialize
462-
! the layer thicknesses, temperatures and salinities.
463+
! temperatures (T) and salinities (S). If T and S are not
464+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
465+
! must be set.
466+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
467+
! The name of the z-space input file used to initialize
468+
! temperatures, only.
469+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
470+
! The name of the z-space input file used to initialize
471+
! temperatures, only.
463472
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
464473
! The name of the potential temperature variable in
465-
! TEMP_SALT_Z_INIT_FILE.
474+
! TEMP_Z_INIT_FILE.
466475
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
467476
! The name of the salinity variable in
468-
! TEMP_SALT_Z_INIT_FILE.
477+
! SALT_Z_INIT_FILE.
469478
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
470479
! If True, then horizontally homogenize the interpolated
471480
! initial conditions.

‎coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none"
155155
! === module MOM_coord_initialization ===
156156
COORD_CONFIG = "file" !
157157
! This specifies how layers are to be defined:
158+
! ALE or none - used to avoid defining layers in ALE mode
158159
! file - read coordinate information from the file
159160
! specified by (COORD_FILE).
160161
! BFB - Custom coords for buoyancy-forced basin case
@@ -185,13 +186,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
185186
! === module MOM_initialize_layers_from_Z ===
186187
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
187188
! The name of the z-space input file used to initialize
188-
! the layer thicknesses, temperatures and salinities.
189+
! temperatures (T) and salinities (S). If T and S are not
190+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
191+
! must be set.
189192
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
190193
! The name of the potential temperature variable in
191-
! TEMP_SALT_Z_INIT_FILE.
194+
! TEMP_Z_INIT_FILE.
192195
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
193196
! The name of the salinity variable in
194-
! TEMP_SALT_Z_INIT_FILE.
197+
! SALT_Z_INIT_FILE.
195198
ADJUST_THICKNESS = True ! [Boolean] default = False
196199
! If true, all mass below the bottom removed if the
197200
! topography is shallower than the thickness input file

‎coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05
424424
! === module MOM_coord_initialization ===
425425
COORD_CONFIG = "file" !
426426
! This specifies how layers are to be defined:
427+
! ALE or none - used to avoid defining layers in ALE mode
427428
! file - read coordinate information from the file
428429
! specified by (COORD_FILE).
429430
! BFB - Custom coords for buoyancy-forced basin case
@@ -459,13 +460,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
459460
! === module MOM_initialize_layers_from_Z ===
460461
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
461462
! The name of the z-space input file used to initialize
462-
! the layer thicknesses, temperatures and salinities.
463+
! temperatures (T) and salinities (S). If T and S are not
464+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
465+
! must be set.
466+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
467+
! The name of the z-space input file used to initialize
468+
! temperatures, only.
469+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
470+
! The name of the z-space input file used to initialize
471+
! temperatures, only.
463472
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
464473
! The name of the potential temperature variable in
465-
! TEMP_SALT_Z_INIT_FILE.
474+
! TEMP_Z_INIT_FILE.
466475
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
467476
! The name of the salinity variable in
468-
! TEMP_SALT_Z_INIT_FILE.
477+
! SALT_Z_INIT_FILE.
469478
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
470479
! If True, then horizontally homogenize the interpolated
471480
! initial conditions.

‎coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none"
155155
! === module MOM_coord_initialization ===
156156
COORD_CONFIG = "file" !
157157
! This specifies how layers are to be defined:
158+
! ALE or none - used to avoid defining layers in ALE mode
158159
! file - read coordinate information from the file
159160
! specified by (COORD_FILE).
160161
! BFB - Custom coords for buoyancy-forced basin case
@@ -185,13 +186,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
185186
! === module MOM_initialize_layers_from_Z ===
186187
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
187188
! The name of the z-space input file used to initialize
188-
! the layer thicknesses, temperatures and salinities.
189+
! temperatures (T) and salinities (S). If T and S are not
190+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
191+
! must be set.
189192
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
190193
! The name of the potential temperature variable in
191-
! TEMP_SALT_Z_INIT_FILE.
194+
! TEMP_Z_INIT_FILE.
192195
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
193196
! The name of the salinity variable in
194-
! TEMP_SALT_Z_INIT_FILE.
197+
! SALT_Z_INIT_FILE.
195198
ADJUST_THICKNESS = True ! [Boolean] default = False
196199
! If true, all mass below the bottom removed if the
197200
! topography is shallower than the thickness input file

‎ice_ocean_SIS2/Baltic/MOM_parameter_doc.all‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05
424424
! === module MOM_coord_initialization ===
425425
COORD_CONFIG = "file" !
426426
! This specifies how layers are to be defined:
427+
! ALE or none - used to avoid defining layers in ALE mode
427428
! file - read coordinate information from the file
428429
! specified by (COORD_FILE).
429430
! BFB - Custom coords for buoyancy-forced basin case
@@ -459,13 +460,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
459460
! === module MOM_initialize_layers_from_Z ===
460461
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
461462
! The name of the z-space input file used to initialize
462-
! the layer thicknesses, temperatures and salinities.
463+
! temperatures (T) and salinities (S). If T and S are not
464+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
465+
! must be set.
466+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
467+
! The name of the z-space input file used to initialize
468+
! temperatures, only.
469+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
470+
! The name of the z-space input file used to initialize
471+
! temperatures, only.
463472
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
464473
! The name of the potential temperature variable in
465-
! TEMP_SALT_Z_INIT_FILE.
474+
! TEMP_Z_INIT_FILE.
466475
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
467476
! The name of the salinity variable in
468-
! TEMP_SALT_Z_INIT_FILE.
477+
! SALT_Z_INIT_FILE.
469478
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
470479
! If True, then horizontally homogenize the interpolated
471480
! initial conditions.

‎ice_ocean_SIS2/Baltic/MOM_parameter_doc.short‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none"
152152
! === module MOM_coord_initialization ===
153153
COORD_CONFIG = "file" !
154154
! This specifies how layers are to be defined:
155+
! ALE or none - used to avoid defining layers in ALE mode
155156
! file - read coordinate information from the file
156157
! specified by (COORD_FILE).
157158
! BFB - Custom coords for buoyancy-forced basin case
@@ -182,13 +183,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
182183
! === module MOM_initialize_layers_from_Z ===
183184
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
184185
! The name of the z-space input file used to initialize
185-
! the layer thicknesses, temperatures and salinities.
186+
! temperatures (T) and salinities (S). If T and S are not
187+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
188+
! must be set.
186189
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
187190
! The name of the potential temperature variable in
188-
! TEMP_SALT_Z_INIT_FILE.
191+
! TEMP_Z_INIT_FILE.
189192
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
190193
! The name of the salinity variable in
191-
! TEMP_SALT_Z_INIT_FILE.
194+
! SALT_Z_INIT_FILE.
192195
ADJUST_THICKNESS = True ! [Boolean] default = False
193196
! If true, all mass below the bottom removed if the
194197
! topography is shallower than the thickness input file

‎ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05
410410
! === module MOM_coord_initialization ===
411411
COORD_CONFIG = "file" !
412412
! This specifies how layers are to be defined:
413+
! ALE or none - used to avoid defining layers in ALE mode
413414
! file - read coordinate information from the file
414415
! specified by (COORD_FILE).
415416
! BFB - Custom coords for buoyancy-forced basin case
@@ -540,13 +541,21 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False
540541
! === module MOM_initialize_layers_from_Z ===
541542
TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc"
542543
! The name of the z-space input file used to initialize
543-
! the layer thicknesses, temperatures and salinities.
544+
! temperatures (T) and salinities (S). If T and S are not
545+
! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE
546+
! must be set.
547+
TEMP_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
548+
! The name of the z-space input file used to initialize
549+
! temperatures, only.
550+
SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "WOA05_pottemp_salt.nc"
551+
! The name of the z-space input file used to initialize
552+
! temperatures, only.
544553
Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp"
545554
! The name of the potential temperature variable in
546-
! TEMP_SALT_Z_INIT_FILE.
555+
! TEMP_Z_INIT_FILE.
547556
Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt"
548557
! The name of the salinity variable in
549-
! TEMP_SALT_Z_INIT_FILE.
558+
! SALT_Z_INIT_FILE.
550559
Z_INIT_HOMOGENIZE = False ! [Boolean] default = False
551560
! If True, then horizontally homogenize the interpolated
552561
! initial conditions.

0 commit comments

Comments
 (0)
⚡