Repository navigation
MOM_interface changes for regional setups - #316
manishvenu wants to merge 37 commits into
Conversation
| MLE_USE_PBL_MLD: | ||
| description: | | ||
| "TODO" | ||
| "TODO |
There was a problem hiding this comment.
Hey Alper, I wasn't sure if this was just for the description, if it is, happy to remove it
There was a problem hiding this comment.
yes, i think it's just for the description.
|
@manishvenu Is this PR ready for testing? Any reason to keep it draft, or is it ready to be reviewed? |
mnlevy1981
left a comment
There was a problem hiding this comment.
If the regular expressions in config_pes.xml get to be too much, we can punt on that... but I do think we want to update config_component.xml
| <valid_values>REGIONAL,GLOBAL</valid_values> | ||
| <default_value>GLOBAL</default_value> | ||
| <values> | ||
| <value compset="_MOM6%REGIONAL">REGIONAL</value> |
There was a problem hiding this comment.
If you change this to
-<value compset="_MOM6%REGIONAL">REGIONAL</value>
+<value compset="_MOM6%[^_]*REGIONAL">REGIONAL</value>Then you are not required to put %REGIONAL as the first compset modifier (MOM6%REGIONAL%MARBL-BIO would be equivalent to MOM6%MARBL-BIO%REGIONAL)
| </pes> | ||
| </mach> | ||
| <mach name="derecho"> | ||
| <pes pesize="any" compset="_DATM.+_SICE.*_MOM6%REGIONAL(?!.*%MARBL-BIO).+_SWAV"> |
There was a problem hiding this comment.
Same thing, I think you want MOM6%[^_]*REGIONAL here
There was a problem hiding this comment.
hmm, you might need additional logic to rule out MOM6%MARBL-BIO%REGIONAL. What a mess
There was a problem hiding this comment.
This worked if you added the exclusion before the Regional.
| <rootpe_glc>0</rootpe_glc> | ||
| </rootpe> | ||
| </pes> | ||
| <pes pesize="any" compset="_DATM.+_SICE.*_MOM6%REGIONAL[^_]*MARBL-BIO.+_SWAV"> |
There was a problem hiding this comment.
this one is trickier, because you need an or statement to capture when MARBL-BIO precedes REGIONAL, but I would start with MOM6%[^_]*REGIONAL[^_]*MARBL-BIO. The right answer might be MOM6%([^_]*REGIONAL[^_]*MARBL-BIO|[^_]*MARBL-BIO[^_]*REGIONAL) but I'm not super confident in that
There was a problem hiding this comment.
Done - the OR worked.
| <rootpe_glc>0</rootpe_glc> | ||
| </rootpe> | ||
| </pes> | ||
| <pes pesize="any" compset="_DATM.+_CICE.*_MOM6%REGIONAL(?!.*%MARBL-BIO).+_SWAV"> |
There was a problem hiding this comment.
same as one of the above comments
| <rootpe_glc>0</rootpe_glc> | ||
| </rootpe> | ||
| </pes> | ||
| <pes pesize="any" compset="_DATM.+_CICE.*_MOM6%REGIONAL[^_]*MARBL-BIO.+_SWAV"> |
There was a problem hiding this comment.
same as one of the above comments
|
Hey @MNLevy, I updated the regex for the PEs and Claude wrote a quick test script that means it potentially works: /glade/u/home/manishrv/documents/croc/dev/random/test_regex_script.py/glade/u/home/manishrv/documents/croc/dev/random/test_regex_script.py. It's super confusing! Happy to back out the regex changes (last two commits) |
This reverts commit ebc2315.
| <compset> | ||
| <alias>GR_JRA</alias> | ||
| <lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL_SROF_SGLC_SWAV</lname> | ||
| </compset> | ||
|
|
||
| <compset> | ||
| <alias>GR1850MARBL_JRA</alias> | ||
| <lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL%MARBL-BIO_SROF_SGLC_SWAV</lname> | ||
| </compset> | ||
|
|
||
| <compset> | ||
| <alias>GR_JRA_GLOFAS</alias> | ||
| <lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL_DROF%GLOFAS_SGLC_SWAV</lname> | ||
| </compset> | ||
|
|
||
| <compset> | ||
| <alias>GR1850MARBL_JRA_GLOFAS</alias> | ||
| <lname>1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL%MARBL-BIO_DROF%GLOFAS_SGLC_SWAV</lname> | ||
| </compset> |
There was a problem hiding this comment.
@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:
- I assume changing
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 hypothesis CICE%REGIONALis my first thought, but @dabail10 may propose a better modifier
There was a problem hiding this comment.
Maybe this should be another PR? Or can CICE use the MOM6 regional? Because you can't have one without the other?
|
Merged #315 into this for simplicity |
update regional compsets to JRA v1.5 and add wave regional compsets
…to JRA-1p5-2023, use DICE%SSMI in all C*R*
|
Need to update the input nml number of fields to 400 because 300 is too small for MARBL cases on one processor (it's split per processor but there are 330 fields in regional OBC (4) models now) |
cice_ic_panama1_1c3aaa.nc came from the old reference_ice, which wrote a single ice category, so CICE aborted reading it. cice_ic_panama1_6c83a5.nc is regenerated with the fixed reference_ice (CrocoDash ESCOMP#301).
river_nutrients_panama1_1c3aac_nnsm.nc's time axis is 2 days late in FMS (0001-01-01 reference encoded with a Julian-before-1582 calendar), so MARBL runs aborted at their 1900-01-01 start. river_nutrients_panama1_e09757_nnsm.nc is regenerated with the fix (CrocoDash ESCOMP#297); the data is unchanged.
Details:
Changes to the configuration for regional setups. This includes new PE layouts, new compsets, and a new xml variable to turn on regional defaults, which currently only changes MOM_input. The bulk of the new changes are to MOM_input.
Included in this change is the regional testing suite which currently does not pass restarts.