Repository navigation
CROCODILE Regional Setup Changes (Tests, Parameters, Compsets, MOM6 Changes) #316
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
manishvenu
wants to merge
40
commits into
ESCOMP:main
Choose a base branch
from
CROCODILE-CESM:regional_changes_for_croc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
001e6a1
New tests
manishvenu 4ec21f8
MOM_interface changes for regional, only todo is the mom6_domian tupe…
manishvenu e7d3055
MOM_input changes
manishvenu bd7a2b1
Fix formatting
manishvenu 3a86a50
Update MOm6 commit & add the input_nl change back
manishvenu e0f871f
Review COmments + Update MOM6 Commit
manishvenu c78ed29
Merge remote-tracking branch 'upstream/main' into regional_changes_fo…
manishvenu 458432b
Duplicate Param
manishvenu 7a5c1a8
PE Layouts
manishvenu 28deca3
Update
manishvenu 2373b84
Line Add
manishvenu 38b9aff
Reformatted BGC
manishvenu 947569c
in terms of din loc root
manishvenu a34efb3
Try Adding DIN_LOC_ROOT
manishvenu 1a29180
Changes
manishvenu 49462f7
Reduced FIle
manishvenu f74950f
Back:
manishvenu 57d19bd
Relative Path
manishvenu 5d51097
Fix Riv nutri Path
manishvenu 5423719
Change the max files/fields
manishvenu 53ca846
INPUTDIR Changes
manishvenu e27a674
Bracket
manishvenu ebc2315
Try This
manishvenu 795f8b5
Revert "Try This"
manishvenu d9e6b95
Merge branch 'ct_from_main' into regional_changes_for_croc
manishvenu 1a7369b
Add named pesize tiers (XS/S/M/L) for regional MOM6 on Derecho (#10)
manishvenu 661d723
Merge branch 'main' into regional_changes_for_croc
manishvenu 97aceda
CHange MAXTRUNC to Global Vals
manishvenu eb92c31
Update MOm6 to regional tag
manishvenu 5957bf4
new MOM6 commit (merged regional to main)
manishvenu 9bd5808
New WW3 compsets
manishvenu 2523e16
update regional compsets to JRA v1.5 and add wave regional compsets
alperaltuntas d73fa52
Merge pull request #12 from CROCODILE-CESM/new_regional_compsetes
alperaltuntas cd732d3
Regional compsets: drop duplicate CWR_JRA/GWR_JRA, move WW3 variants …
alperaltuntas 5419651
Add regional CICE, WW3 and all-component tests (#13)
manishvenu 6fb0c16
Point regional cice testmods at the ncat=5 Panama CICE initial state
manishvenu f4b6e4e
Point regional bgc testmods at the fixed Panama river nutrient file
manishvenu d877f83
Merge with Main
manishvenu b51a8c6
Remove GLOFAS specific compsets, every regional compset is GLOFAS
manishvenu f60ae05
Remove the regional Derecho PE layouts
manishvenu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule MOM6
updated
7 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
cime_config/testdefs/testmods_dirs/mom/regional/all/include_user_mods
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ../bgc | ||
| ../cice | ||
| ../ww3 |
23 changes: 23 additions & 0 deletions
23
cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| ./xmlchange OCN_GRID=panama1 | ||
| ./xmlchange OCN_NX=60 | ||
| ./xmlchange OCN_NY=60 | ||
| ./xmlchange OCN_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_1c3aaa.nc' | ||
| ./xmlchange ICE_GRID=panama1 | ||
| ./xmlchange ICE_NX=60 | ||
| ./xmlchange ICE_NY=60 | ||
| ./xmlchange ICE_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_1c3aaa.nc' | ||
| ./xmlchange MASK_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_1c3aaa.nc' | ||
| ./xmlchange ATM_GRID=TL319 | ||
| ./xmlchange LND_GRID=TL319 | ||
| ./xmlchange ATM_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' | ||
| ./xmlchange LND_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' | ||
| ./xmlchange ROF_GRID=GLOFAS | ||
| ./xmlchange ROF_DOMAIN_MESH='${DIN_LOC_ROOT}/lnd/dlnd7/GLOFAS/GLOFAS.v4.dis24.ESMFmesh_20260501.nc' | ||
| ./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric | ||
| ./xmlchange ROF2OCN_LIQ_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' | ||
| ./xmlchange ROF2OCN_ICE_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' | ||
| ./xmlchange CALENDAR=GREGORIAN | ||
| ./xmlchange RUN_STARTDATE=2000-01-01 | ||
|
|
||
| # Set PE Layout | ||
| ./xmlchange NTASKS_OCN=20 |
63 changes: 63 additions & 0 deletions
63
cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| ! Generated by CrocoDash on the Panama test grid with synthetic forcing (reference_ocean). | ||
| ! INPUTDIR is set by MOM_input.yaml because it requires a hard-coded path | ||
| ! Custom Horizonal Grid, Topography, and Vertical Grid | ||
| TRIPOLAR_N = False | ||
| REENTRANT_X = False | ||
| REENTRANT_Y = False | ||
| NIGLOBAL = 60 | ||
| NJGLOBAL = 60 | ||
| GRID_CONFIG = mosaic | ||
| GRID_FILE = ocean_hgrid_panama1_1c3aaa.nc | ||
| TOPO_CONFIG = file | ||
| TOPO_FILE = ocean_topog_panama1_1c3aaa.nc | ||
| MAXIMUM_DEPTH = 3431.7499950346473 | ||
| MINIMUM_DEPTH = 9.5 | ||
| NK = 75 | ||
| COORD_CONFIG = none | ||
| ALE_COORDINATE_CONFIG = FILE:ocean_vgrid_panama1_1c3aaa.nc | ||
| REGRIDDING_COORDINATE_MODE = Z* | ||
|
|
||
| ! Timesteps (based on grid resolution) | ||
| DT = 300.0 | ||
| DT_THERM = 900.0 | ||
|
|
||
| ! Initial conditions | ||
| INIT_LAYERS_FROM_Z_FILE = True | ||
| Z_INIT_ALE_REMAPPING = True | ||
| TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = True | ||
| DEPRESS_INITIAL_SURFACE = True | ||
| VELOCITY_CONFIG = file | ||
| TEMP_SALT_Z_INIT_FILE = init_tracers_filled.nc | ||
| SURFACE_HEIGHT_IC_FILE = init_eta_filled.nc | ||
| VELOCITY_FILE = init_vel_filled.nc | ||
| Z_INIT_FILE_PTEMP_VAR = temp | ||
| Z_INIT_FILE_SALT_VAR = salt | ||
| SURFACE_HEIGHT_IC_VAR = eta_t | ||
| U_IC_VAR = u | ||
| V_IC_VAR = v | ||
|
|
||
| ! Open boundary conditions | ||
| OBC_NUMBER_OF_SEGMENTS = 4 | ||
| OBC_FREESLIP_VORTICITY = False | ||
| OBC_FREESLIP_STRAIN = False | ||
| OBC_COMPUTED_VORTICITY = True | ||
| OBC_COMPUTED_STRAIN = True | ||
| OBC_ZERO_BIHARMONIC = True | ||
| OBC_TRACER_RESERVOIR_LENGTH_SCALE_OUT = 3.0E+04 | ||
| OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 | ||
| BRUSHCUTTER_MODE = True | ||
| ENABLE_BUGS_BY_DEFAULT = False | ||
| OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" | ||
| OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 | ||
| OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt)" | ||
| OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" | ||
| OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 | ||
| OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt)" | ||
| OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" | ||
| OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 | ||
| OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt)" | ||
| OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" | ||
| OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 | ||
| OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt)" | ||
|
|
||
| ! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) |
23 changes: 23 additions & 0 deletions
23
cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| ./xmlchange OCN_GRID=panama1 | ||
| ./xmlchange OCN_NX=60 | ||
| ./xmlchange OCN_NY=60 | ||
| ./xmlchange OCN_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_1c3aac.nc' | ||
| ./xmlchange ICE_GRID=panama1 | ||
| ./xmlchange ICE_NX=60 | ||
| ./xmlchange ICE_NY=60 | ||
| ./xmlchange ICE_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_1c3aac.nc' | ||
| ./xmlchange MASK_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_1c3aac.nc' | ||
| ./xmlchange ATM_GRID=TL319 | ||
| ./xmlchange LND_GRID=TL319 | ||
| ./xmlchange ATM_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' | ||
| ./xmlchange LND_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' | ||
| ./xmlchange ROF_GRID=GLOFAS | ||
| ./xmlchange ROF_DOMAIN_MESH='${DIN_LOC_ROOT}/lnd/dlnd7/GLOFAS/GLOFAS.v4.dis24.ESMFmesh_20260501.nc' | ||
| ./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric | ||
| ./xmlchange ROF2OCN_LIQ_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' | ||
| ./xmlchange ROF2OCN_ICE_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' | ||
| ./xmlchange CALENDAR=GREGORIAN | ||
| ./xmlchange RUN_STARTDATE=2000-01-01 | ||
|
|
||
| # Set PE Layout | ||
| ./xmlchange NTASKS_OCN=30 |
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_marbl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| lvariable_NtoC = .false. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dabail10 and I were talking, and we probably want a CICE modifier as well (e.g.
CICE%REGIONAL). Now that open boundary conditions are available in CICE, he's going to test that code out but eventually CICE will want to be able to configure regional domains.Two notes:
CICEtoCICE%<something_else>will not change answers if CICE'sconfig_component.xmldoesn't know what to do with the new modifier, but it's worth testing that hypothesisCICE%REGIONALis my first thought, but @dabail10 may propose a better modifierThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe this should be another PR? Or can CICE use the MOM6 regional? Because you can't have one without the other?