Skip to content

Commit

Permalink
Merge pull request #1951 from gold2718/seDomainFiles
Browse files Browse the repository at this point in the history 
Added missing domain files (ne30np4), removed non-implemented grids.
Use gx1v7 mask for NE16 grids.
Fixed typo in a%ne120np4.pg4 coupling interval.

Test suite: ./scripts_regression_tests.py on Cheyenne
ERP_Ln9.ne30_ne30_mg17.F2000_DEV.yellowstone (gets past grid issue but dies in CLM).
QPC5 test run using --res ne30_ne30_mg17
Test baseline: NA
Test namelist changes: NA
Test status: bit for bit

Fixes #1938

User interface changes?: N

Update gh-pages html (Y/N)?: N

Code review:
  • Loading branch information
@mvertens
mvertens authored Oct 8, 2017
2 parents 3f12a5f + 2de7041 commit 443312c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 31 deletions.
53 changes: 23 additions & 30 deletions config/cesm/config_grids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,13 +715,6 @@
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="ne60_ne60_mg17" not_compset="_POP">
<grid name="atm">ne60np4</grid>
<grid name="lnd">ne60np4</grid>
<grid name="ocnice">ne60np4</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="ne120_g16">
<grid name="atm">ne120np4</grid>
<grid name="lnd">ne120np4</grid>
Expand Down Expand Up @@ -750,13 +743,6 @@
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="ne120_ne120_mg17" not_compset="_POP">
<grid name="atm">ne120np4</grid>
<grid name="lnd">ne120np4</grid>
<grid name="ocnice">ne120np4</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="ne240_f02_g16">
<grid name="atm">ne240np4</grid>
<grid name="lnd">0.23x0.31</grid>
Expand Down Expand Up @@ -787,13 +773,6 @@
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="ne240_ne240_mg17" not_compset="_POP">
<grid name="atm">ne240np4</grid>
<grid name="lnd">ne240np4</grid>
<grid name="ocnice">ne240np4</grid>
<mask>gx1v7</mask>
</model_grid>

<!-- spectral element grids with 2x2 FVM physics grid -->

<model_grid alias="ne30pg2_ne30pg2_mg17" not_compset="_POP|_CLM">
Expand Down Expand Up @@ -1144,39 +1123,42 @@

<domain name="ne5np4">
<nx>1352</nx> <ny>1</ny>
<file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4_gx3v7.140810.nc</file>
<file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4_gx3v7.140810.nc</file>
<file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4_gx3v7.140810.nc</file>
<file grid="ocnice" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4_gx3v7.140810.nc</file>
<desc>ne5np4 is Spectral Elem 6-deg grid:</desc>
<support>For ultra-low resolution spectral element grid testing</support>
</domain>

<domain name="ne5np4.pg3">
<nx>1350</nx> <ny>1</ny>
<file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg3_gx3v7.170605.nc</file>
<file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4.pg3_gx3v7.170605.nc</file>
<file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg3_gx3v7.170605.nc</file>
<file grid="ocnice" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4.pg3_gx3v7.170605.nc</file>
<desc>ne5np4 is Spectral Elem 6-deg grid with a 3x3 FVM physics grid:</desc>
<support>For ultra-low resolution spectral element grid testing</support>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne16np4">
<nx>13826</nx> <ny>1</ny>
<file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.lnd.ne16np4_gx3v7.120406.nc</file>
<file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.ne16np4_gx3v7.121113.nc</file>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne16_gx1v7.171003.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne16_gx1v7.171003.nc</file>
<desc>ne16np4 is Spectral Elem 2-deg grid:</desc>
<support>For low resolution spectral element grid testing</support>
</domain>

<domain name="ne16np4.pg3">
<nx>13824</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne16np4.pg3_gx1v7.170607.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne16np4.pg3_gx1v7_170607.nc</file>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne16pg3_gx1v7.171003.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne16pg3_gx1v7.171003.nc</file>
<desc>ne16np4.pg3 is a Spectral Elem 2-deg grid with a 3x3 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne30np4">
<nx>48602</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4_gx1v6.110905.nc</file>
<file grid="ocnice" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_gx1v6_110217.nc</file>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30_gx1v7.171003.nc</file>
<desc>ne30np4 is Spectral Elem 1-deg grid:</desc>
</domain>

Expand All @@ -1185,20 +1167,23 @@
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg2_gx1v7.170628.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4.pg2_gx1v7.170628.nc</file>
<desc>ne30np4.pg2 is a Spectral Elem 1-deg grid with a 2x2 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne30np4.pg3">
<nx>48600</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg3_gx1v7.170605.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4.pg3_gx1v7_170605.nc</file>
<desc>ne30np4.pg3 is a Spectral Elem 1-deg grid with a 3x3 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne30np4.pg4">
<nx>86400</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30np4.pg4_gx1v7.170628.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4.pg4_gx1v7.170628.nc</file>
<desc>ne30np4.pg4 is a Spectral Elem 1-deg grid with a 4x4 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne60np4">
Expand All @@ -1213,20 +1198,23 @@
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg2_gx1v7.170628.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4.pg2_gx1v7.170628.nc</file>
<desc>ne60np4.pg2 is a Spectral Elem 0.5-deg grid with a 2x2 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne60np4.pg3">
<nx>194400</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg3_gx1v7.170628.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4.pg3_gx1v7.170628.nc</file>
<desc>ne60np4.pg3 is a Spectral Elem 0.5-deg grid with a 3x3 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne60np4.pg4">
<nx>345600</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4.pg4_gx1v7.170628.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4.pg4_gx1v7.170628.nc</file>
<desc>ne60np4.pg4 is a Spectral Elem 0.5-deg grid with a 4x4 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne120np4">
Expand All @@ -1241,20 +1229,23 @@
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg2_gx1v7.170629.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg2_gx1v7.170629.nc</file>
<desc>ne120np4.pg2 is a Spectral Elem 0.25-deg grid with a 2x2 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne120np4.pg3">
<nx>777600</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg3_gx1v7.170629.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg3_gx1v7.170629.nc</file>
<desc>ne120np4.pg3 is a Spectral Elem 0.25-deg grid with a 3x3 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne120np4.pg4">
<nx>1382400</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg4_gx1v7.170629.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg4_gx1v7.170629.nc</file>
<desc>ne120np4.pg4 is a Spectral Elem 0.25-deg grid with a 4x4 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne240np4">
Expand All @@ -1270,13 +1261,15 @@
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne240np4.pg2_gx1v7.170629.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne240np4.pg2_gx1v7.170629.nc</file>
<desc>ne240np4.pg2 is a Spectral Elem 0.125-deg grid with a 2x2 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="ne240np4.pg3">
<nx>3110400</nx> <ny>1</ny>
<file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne240np4.pg3_gx1v7.170629.nc</file>
<file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne240np4.pg3_gx1v7.170629.nc</file>
<desc>ne240np4.pg3 is a Spectral Elem 0.125-deg grid with a 3x3 FVM physics grid:</desc>
<support>EXPERIMENTAL FVM physics grid</support>
</domain>

<domain name="gx1v6">
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/mct/cime_config/config_component_cesm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
<value compset=".+" grid="a%ne120np4">96</value>
<value compset=".+" grid="a%ne120np4.pg2">96</value>
<value compset=".+" grid="a%ne120np4.pg3">96</value>
<value compset=".+" grid="a%ne120np4.pg4">144</value>
<value compset=".+" grid="a%ne120np4.pg4">96</value>
<value compset=".+" grid="a%ne240np4">144</value>
<value compset=".+" grid="a%ne240np4.pg2">144</value>
<value compset=".+" grid="a%ne240np4.pg3">144</value>
Expand Down

0 comments on commit 443312c

Please sign in to comment.