Skip to content

CROCODILE Regional Setup Changes (Tests, Parameters, PE Layouts, 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.

Sign up for GitHub

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 39 commits into
base: main
Choose a base branch
from
Open

CROCODILE Regional Setup Changes (Tests, Parameters, PE Layouts, Compsets, MOM6 Changes) #316

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
001e6a1
New tests
manishvenu Mar 25, 2026
4ec21f8
MOM_interface changes for regional, only todo is the mom6_domian tupe…
manishvenu Mar 25, 2026
e7d3055
MOM_input changes
manishvenu Mar 25, 2026
bd7a2b1
Fix formatting
manishvenu Mar 25, 2026
3a86a50
Update MOm6 commit & add the input_nl change back
manishvenu Mar 30, 2026
e0f871f
Review COmments + Update MOM6 Commit
manishvenu May 1, 2026
c78ed29
Merge remote-tracking branch 'upstream/main' into regional_changes_fo…
manishvenu May 1, 2026
458432b
Duplicate Param
manishvenu May 1, 2026
7a5c1a8
PE Layouts
manishvenu May 1, 2026
28deca3
Update
manishvenu May 1, 2026
2373b84
Line Add
manishvenu May 5, 2026
38b9aff
Reformatted BGC
manishvenu May 5, 2026
947569c
in terms of din loc root
manishvenu May 5, 2026
a34efb3
Try Adding DIN_LOC_ROOT
manishvenu May 5, 2026
1a29180
Changes
manishvenu May 5, 2026
49462f7
Reduced FIle
manishvenu May 5, 2026
f74950f
Back:
manishvenu May 5, 2026
57d19bd
Relative Path
manishvenu May 6, 2026
5d51097
Fix Riv nutri Path
manishvenu May 6, 2026
5423719
Change the max files/fields
manishvenu May 6, 2026
53ca846
INPUTDIR Changes
manishvenu May 7, 2026
e27a674
Bracket
manishvenu May 7, 2026
ebc2315
Try This
manishvenu May 7, 2026
795f8b5
Revert "Try This"
manishvenu May 7, 2026
d9e6b95
Merge branch 'ct_from_main' into regional_changes_for_croc
manishvenu Jun 24, 2026
1a7369b
Add named pesize tiers (XS/S/M/L) for regional MOM6 on Derecho (#10)
manishvenu Aug 31, 2026
661d723
Merge branch 'main' into regional_changes_for_croc
manishvenu Aug 31, 2026
97aceda
CHange MAXTRUNC to Global Vals
manishvenu Aug 31, 2026
eb92c31
Update MOm6 to regional tag
manishvenu Aug 31, 2026
5957bf4
new MOM6 commit (merged regional to main)
manishvenu Sep 8, 2026
9bd5808
New WW3 compsets
manishvenu Sep 10, 2026
2523e16
update regional compsets to JRA v1.5 and add wave regional compsets
alperaltuntas Sep 22, 2026
d73fa52
Merge pull request #12 from CROCODILE-CESM/new_regional_compsetes
alperaltuntas Sep 22, 2026
cd732d3
Regional compsets: drop duplicate CWR_JRA/GWR_JRA, move WW3 variants …
alperaltuntas Sep 24, 2026
5419651
Add regional CICE, WW3 and all-component tests (#13)
manishvenu Oct 6, 2026
6fb0c16
Point regional cice testmods at the ncat=5 Panama CICE initial state
manishvenu Oct 6, 2026
f4b6e4e
Point regional bgc testmods at the fixed Panama river nutrient file
manishvenu Oct 6, 2026
d877f83
Merge with Main
manishvenu Oct 23, 2026
b51a8c6
Remove GLOFAS specific compsets, every regional compset is GLOFAS
manishvenu Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MOM6
Open in desktop
Submodule MOM6 updated 3 files
+6 −7 config_src/drivers/nuopc_cap/mom_cap.F90
+104 −6 src/tracer/MARBL_tracers.F90
+3 −1 src/tracer/MOM_tracer_flow_control.F90
16 changes: 15 additions & 1 deletion cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
<entry_id version="3.0">

<description>
<desc ocn="MOM6[%MARBL-BIO][%MARBL-ABIO]">MOM6 OCEAN </desc>
<desc ocn="MOM6[%REGIONAL][%MARBL-BIO][%MARBL-ABIO]">MOM6 OCEAN </desc>
<desc option="MARBL-BIO">MARBL Biogeochemistry Tracer Library base biotic tracers</desc>
<desc option="MARBL-ABIO">MARBL Biogeochemistry Tracer Library abiotic DIC tracers</desc>
<desc option="REGIONAL">Regional Setup</desc>
</description>

<entry id="COMP_OCN">
Expand Down Expand Up @@ -204,6 +205,19 @@
</desc>
</entry>

<entry id="MOM6_DOMAIN_TYPE">
<type>char</type>
<valid_values>REGIONAL,GLOBAL</valid_values>
<default_value>GLOBAL</default_value>
<values>
<value compset="_MOM6%REGIONAL">REGIONAL</value>

@mnlevy1981 mnlevy1981 Apr 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

@manishvenu manishvenu May 1, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

</values>
<group>case_comp</group>
<file>env_run.xml</file>
<desc> Flag to turn on/off the regional/global defaults for MOM_input
</desc>
</entry>

<help>
=========================================
MOM6 naming conventions
Expand Down
44 changes: 44 additions & 0 deletions cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,28 @@
<lname>1850_DATM%JRA_SLND_DICE%SSMI_MOM6%MARBL-ABIO_DROF%JRA_SGLC_SWAV</lname>
</compset>

<!-- C Regional compsets -->

<compset>
<alias>CR_JRA</alias>
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>CR1850MARBL_JRA</alias>
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL%MARBL-BIO_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>CR_JRA_GLOFAS</alias>
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL_DROF%GLOFAS_SGLC_SWAV</lname>
</compset>

<compset>
<alias>CR1850MARBL_JRA_GLOFAS</alias>
<lname>1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL%MARBL-BIO_DROF%GLOFAS_SGLC_SWAV</lname>
</compset>

<!-- G compsets -->

<compset>
Expand Down Expand Up @@ -120,4 +142,26 @@
<lname>1850_DATM%JRA-1p5-2023_SLND_CICE_MOM6%MARBL-ABIO_DROF%JRA-1p5-2023_SGLC_WW3</lname>
</compset>

<!-- G Regional compsets -->

<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>
Comment on lines +175 to +188

@mnlevy1981 mnlevy1981 Jun 18, 2026

Copy link
Copy Markdown
Collaborator

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:

  1. I assume changing CICE to CICE%<something_else> will not change answers if CICE's config_component.xml doesn't know what to do with the new modifier, but it's worth testing that hypothesis
  2. CICE%REGIONAL is my first thought, but @dabail10 may propose a better modifier

@manishvenu manishvenu Jun 24, 2026

Copy link
Copy Markdown
Collaborator Author

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?


</compsets>
134 changes: 134 additions & 0 deletions cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,140 @@
</rootpe>
</pes>
</mach>
<mach name="derecho">
<pes pesize="any" compset="_DATM.+_SICE.*_MOM6%REGIONAL(?!.*%MARBL-BIO).+_SWAV">

@mnlevy1981 mnlevy1981 Apr 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thing, I think you want MOM6%[^_]*REGIONAL here

@mnlevy1981 mnlevy1981 Apr 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, you might need additional logic to rule out MOM6%MARBL-BIO%REGIONAL. What a mess

@manishvenu manishvenu May 1, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This worked if you added the exclusion before the Regional.

<comment>Regional modeling configuration with SICE</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>128</ntasks_ocn>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_wav>128</ntasks_wav>
<ntasks_glc>128</ntasks_glc>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="_DATM.+_SICE.*_MOM6%REGIONAL[^_]*MARBL-BIO.+_SWAV">

@mnlevy1981 mnlevy1981 Apr 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@manishvenu manishvenu May 1, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done - the OR worked.

<comment>Regional modeling configuration with SICE and MARBL-BIO</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>384</ntasks_ocn>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_wav>128</ntasks_wav>
<ntasks_glc>128</ntasks_glc>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>128</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6%REGIONAL(?!.*%MARBL-BIO).+_SWAV">

@mnlevy1981 mnlevy1981 Apr 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as one of the above comments

@manishvenu manishvenu May 1, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

<comment>Regional modeling configuration with CICE</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>128</ntasks_ocn>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_wav>128</ntasks_wav>
<ntasks_glc>128</ntasks_glc>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>128</rootpe_ice>
<rootpe_ocn>256</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6%REGIONAL[^_]*MARBL-BIO.+_SWAV">

@mnlevy1981 mnlevy1981 Apr 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as one of the above comments

@manishvenu manishvenu May 1, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

<comment>Regional modeling configuration with CICE and MARBL-BIO</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_cpl>128</ntasks_cpl>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>384</ntasks_ocn>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_wav>128</ntasks_wav>
<ntasks_glc>128</ntasks_glc>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_rof>0</rootpe_rof>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ice>128</rootpe_ice>
<rootpe_ocn>256</rootpe_ocn>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
</mach>
</grid>

<grid name="a%(TL319|T62).+oi%tx2_3v2">
Expand Down
Loading
Loading