Skip to content

Commit

Permalink
Merge pull request #3785 from billsacks/remove_cism1
Browse files Browse the repository at this point in the history 
CESM-CISM no longer supports CISM1, so we can remove support for its
5-km grid.

Test suite: scripts_regression_tests on cheyenne, plus ERS_Ly11.f09_g17_gl20.T1850G.cheyenne_gnu and SMS_D_Ly1.f09_g17_gl4.T1850G.cheyenne_gnu from cism2_1_74
Test baseline: cism2_1_74 for the two extra tests
Test namelist changes: none
Test status: bit for bit

Fixes none

User interface changes?: none

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

Code review: @fischer-ncar
  • Loading branch information
@fischer-ncar
fischer-ncar authored Mar 12, 2021
2 parents d67b18e + dd7b446 commit 3321317
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 175 deletions.
94 changes: 0 additions & 94 deletions config/cesm/config_grids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<grid name="rof" compset="DROF%CPLHIST">r05</grid>
<grid name="rof" compset="XROF" >r05</grid>
<grid name="glc" compset="SGLC" >null</grid>
<grid name="glc" compset="CISM1" >gland5UM</grid>
<grid name="glc" compset="CISM2" >gland4</grid>
<grid name="glc" compset="XGLC" >gland4</grid>
<grid name="wav" compset="SWAV" >null</grid>
Expand Down Expand Up @@ -170,14 +169,6 @@
<mask>gx3v7</mask>
</model_grid>

<model_grid alias="T31_g37_gl5" compset="_CISM">
<grid name="atm">T31</grid>
<grid name="lnd">T31</grid>
<grid name="ocnice">gx3v7</grid>
<grid name="glc">gland5UM</grid>
<mask>gx3v7</mask>
</model_grid>

<model_grid alias="T42_T42" not_compset="_POP">
<grid name="atm">T42</grid>
<grid name="lnd">T42</grid>
Expand Down Expand Up @@ -491,22 +482,6 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_g16_gl5" compset="_CISM">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">gx1v6</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="f09_g17_gl5" compset="_CISM">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">gx1v7</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_f09_mnull" compset="_DOCN%SAQUAP|DOCN%DAQUAP" >
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
Expand Down Expand Up @@ -535,30 +510,6 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_f09_gl5" compset="_CISM" not_compset="_POP">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="f09_f09_gl5_mg16" compset="_CISM" not_compset="_POP">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="f09_f09_gl5_mg17" compset="_CISM" not_compset="_POP">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_g16">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
Expand Down Expand Up @@ -613,46 +564,6 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_g16_gl5" compset="_CISM">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">gx1v6</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="f19_g17_gl5" compset="_CISM">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">gx1v7</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_f19_gl5" compset="_CISM" not_compset="_POP">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="f19_f19_gl5_mg16" compset="_CISM" not_compset="_POP">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="f19_f19_gl5_mg17" compset="_CISM" not_compset="_POP">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
<grid name="glc">gland5UM</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_f19_mg16" not_compset="_POP">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
Expand Down Expand Up @@ -1987,11 +1898,6 @@
<desc>20-km Greenland grid</desc>
</domain>

<domain name="gland5UM">
<nx>301</nx> <ny>561</ny>
<desc>5-km Greenland grid (new version from U. Montana)</desc>
</domain>

<domain name="gland4">
<nx>416</nx> <ny>704</ny>
<mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/greenland_4km_epsg3413_c170414_ESMFmesh_c20190729.nc</mesh>
Expand Down
14 changes: 0 additions & 14 deletions config/cesm/config_grids_common.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,20 +119,6 @@
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v6" glc_grid="gland5UM" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx1v6_nnsm_e1000r300_171105.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v7" glc_grid="gland5UM" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx1v7_nnsm_e1000r300_171105.nc</map>
</gridmap>
<!-- POP's estuary box model is currently not active for gx3v7, so
we need nnsm maps for liquid as well as ice. -->
<gridmap ocn_grid="gx3v7" glc_grid="gland5UM" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
</gridmap>

<gridmap ocn_grid="gx1v6" glc_grid="gland20" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
Expand Down
67 changes: 0 additions & 67 deletions config/cesm/config_grids_mct.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -894,73 +894,6 @@
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland4km/map_gland4km_TO_ne120np4.pg3_aave.190503.nc</map>
</gridmap>

<!-- ==================== -->
<!-- GLC: gland5UM -->
<!-- ==================== -->

<gridmap lnd_grid="0.9x1.25" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_TO_gland5km_aave.150514.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_TO_gland5km_blin.150514.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv0.9x1.25_aave.150514.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv0.9x1.25_aave.150514.nc</map>
</gridmap>

<gridmap lnd_grid="1.9x2.5" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gland5km_aave.150514.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gland5km_blin.150514.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv1.9x2.5_aave.150514.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv1.9x2.5_aave.150514.nc</map>
</gridmap>

<gridmap lnd_grid="T31" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/T31/map_T31_TO_gland5km_aave.150514.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/T31/map_T31_TO_gland5km_blin.150514.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_T31_aave.150514.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_T31_aave.150514.nc</map>
</gridmap>

<gridmap lnd_grid="360x720cru" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/360x720/map_360x720_TO_gland5km_aave.160329.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/360x720/map_360x720_TO_gland5km_blin.160329.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_360x720_aave.160329.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_360x720_aave.160329.nc</map>
</gridmap>

<gridmap lnd_grid="10x15" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/fv10x15/map_fv10x15_TO_gland5km_aave.160329.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/fv10x15/map_fv10x15_TO_gland5km_blin.160329.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv10x15_aave.160329.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv10x15_aave.160329.nc</map>
</gridmap>

<gridmap lnd_grid="4x5" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/fv4x5/map_fv4x5_TO_gland5km_aave.160329.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/fv4x5/map_fv4x5_TO_gland5km_blin.160329.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv4x5_aave.160329.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_fv4x5_aave.160329.nc</map>
</gridmap>

<gridmap lnd_grid="ne16np4" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne16np4/map_ne16np4_TO_gland5km_aave.160329.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne16np4/map_ne16np4_TO_gland5km_blin.160329.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_ne16np4_aave.160329.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_ne16np4_aave.160329.nc</map>
</gridmap>

<gridmap lnd_grid="ne30np4" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne30np4/map_ne30np4_TO_gland5km_aave.160329.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne30np4/map_ne30np4_TO_gland5km_blin.160329.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_ne30np4_aave.160329.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_ne30np4_aave.160329.nc</map>
</gridmap>

<gridmap lnd_grid="ne120np4" glc_grid="gland5UM" >
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne120np4/map_ne120np4_TO_gland5km_aave.160329.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne120np4/map_ne120np4_TO_gland5km_blin.160329.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_ne120np4_aave.160329.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland5km/map_gland5km_TO_ne120np4_aave.160329.nc</map>
</gridmap>

<!-- ==================== -->
<!-- GLC: gland20 -->
<!-- ==================== -->
Expand Down

0 comments on commit 3321317

Please sign in to comment.