Skip to content
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

Jump to bottom

MizuRoute lake grids #75

Merged
merged 13 commits into from
Dec 17, 2022
Merged

MizuRoute lake grids #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5dcf8b2
Add HDMA_lake_mz for mizuroute HDMA grid with lakes, which is actuall…
ekluzek Nov 23, 2022
bb9249d
Add grid aliases that include mizuRoute HDMA_lake_mz grids, also chan…
ekluzek Nov 23, 2022
72192e5
Add maps for f09, f19, and hcru for the HDMA_lake_mz mizuRoute grid
ekluzek Nov 24, 2022
e5e6db1
Merge commit '5dcf8b2' into mizuroutelakegrids
ekluzek Nov 24, 2022
9b6602f
Merge commit 'bb9249d' into mizuroutelakegrids
ekluzek Nov 24, 2022
1beb714
Merge commit '72192e5' into mizuroutelakegrids
ekluzek Nov 24, 2022
85853b0
Merge tag 'ccs_config_cesm0.0.38' into mizuroutelakegrids
ekluzek Nov 24, 2022
75822af
Fix the mesh for the HDMA lake grid for mizuRoute
ekluzek Nov 30, 2022
dc82bf7
Merge tag 'ccs_config_cesm0.0.49' into mizuroutelakegrids
ekluzek Dec 1, 2022
f748194
Fix #72 schema error for config_batch
ekluzek Dec 1, 2022
ec740cd
Merge remote-tracking branch 'esmci/main' into mizuroutelakegrids
ekluzek Dec 6, 2022
d4d3168
Revert "Fix #72 schema error for config_batch"
ekluzek Dec 9, 2022
4dcfe92
Remove the mizuRoute grids from MCT grid list, as mizuRoute is only f…
ekluzek Dec 16, 2022
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
9 changes: 9 additions & 0 deletions component_grids_nuopc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,15 @@
<mesh>$DIN_LOC_ROOT/rof/mizuRoute/meshes/polygon_centroid/HDMAmz_global_ctrcrd_sqr_cdf5_ESMFmesh_c20201005.nc</mesh>
<desc>HDMAmz is a medium resolution global river routing grid for mizuRoute:</desc>
</domain>
<domain name="HDMA_lake_mz">
<nx>298277</nx> <ny>1</ny>
<!-- This is the actual full mesh, but it's complex and takes hours to read
<mesh></mesh>
-->
<!-- This is a simplified mesh that only includes the polygon centers, so requires a mapping file with it -->
<mesh>$DIN_LOC_ROOT/rof/mizuRoute/meshes/polygon_centroid/HDMA_lake_mz_global_ctrcrd_sqr_cdf5_ESMFmesh_c20221117.nc</mesh>
<desc>HDMA_lake_mz is a medium resolution global river routing grid that includes lakes for mizuRoute:</desc>
</domain>
<domain name="MERITmz">
<nx>2996635</nx> <ny>1</ny>
<!-- The full mesh for MERIT-Hydro does not work with ESMF so we only have the simplified mesh -->
Expand Down
18 changes: 18 additions & 0 deletions maps_nuopc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@
<map name="LND2ROF_FMAPNAME">rof/mizuRoute/gridmaps/map_f19_TO_HDMAmz_aave.200901.nc</map>
<map name="ROF2LND_FMAPNAME">rof/mizuRoute/gridmaps/map_HDMAmz_TO_f19_aave.200901.nc</map>
</gridmap>
<gridmap lnd_grid="1.9x2.5" rof_grid="HDMA_lake_mz">
<!-- These mapping files were NOT created using ESMF as ESMF regridding failed, but with an offline python script -->
<!-- They were then converted to SCRIP mapping file format so they could be read by cime -->
<map name="LND2ROF_FMAPNAME">rof/mizuRoute/gridmaps/map_f19_TO_HDMAlakemz_aave_cdf5.221117.nc</map>
<map name="ROF2LND_FMAPNAME">rof/mizuRoute/gridmaps/map_HDMAlakemz_TO_f19_aave_cdf5.221117.nc</map>
</gridmap>
<gridmap lnd_grid="1.9x2.5" rof_grid="MERITmz">
<!-- These mapping files were NOT created using ESMF as ESMF regridding failed, but with an offline python script -->
<!-- They were then converted to SCRIP mapping file format so they could be read by cime -->
Expand All @@ -183,6 +189,12 @@
<map name="LND2ROF_FMAPNAME">rof/mizuRoute/gridmaps/map_f09_TO_HDMAmz_aave.210321.nc</map>
<map name="ROF2LND_FMAPNAME">rof/mizuRoute/gridmaps/map_HDMAmz_TO_f09_aave.210321.nc</map>
</gridmap>
<gridmap lnd_grid="0.9x1.25" rof_grid="HDMA_lake_mz">
<!-- These mapping files were NOT created using ESMF as ESMF regridding failed, but with an offline python script -->
<!-- They were then converted to SCRIP mapping file format so they could be read by cime -->
<map name="LND2ROF_FMAPNAME">rof/mizuRoute/gridmaps/map_f09_TO_HDMAlakemz_aave_cdf5.221117.nc</map>
<map name="ROF2LND_FMAPNAME">rof/mizuRoute/gridmaps/map_HDMAlakemz_TO_f09_aave_cdf5.221117.nc</map>
</gridmap>
<gridmap lnd_grid="0.9x1.25" rof_grid="MERITmz">
<!-- These mapping files were NOT created using ESMF as ESMF regridding failed, but with an offline python script -->
<!-- They were then converted to SCRIP mapping file format so they could be read by cime -->
Expand All @@ -197,6 +209,12 @@
<map name="LND2ROF_FMAPNAME">rof/mizuRoute/gridmaps/map_hcru_TO_HDMAmz_aave.210924.nc</map>
<map name="ROF2LND_FMAPNAME">rof/mizuRoute/gridmaps/map_HDMAmz_TO_hcru_aave.210924.nc</map>
</gridmap>
<gridmap lnd_grid="360x720cru" rof_grid="HDMA_lake_mz">
<!-- These mapping files were NOT created using ESMF as ESMF regridding failed, but with an offline python script -->
<!-- They were then converted to SCRIP mapping file format so they could be read by cime -->
<map name="LND2ROF_FMAPNAME">rof/mizuRoute/gridmaps/map_hcru_TO_HDMAlakemz_aave_cdf5.221117.nc</map>
<map name="ROF2LND_FMAPNAME">rof/mizuRoute/gridmaps/map_HDMAlakemz_TO_hcru_aave_cdf5.221117.nc</map>
</gridmap>
<gridmap lnd_grid="360x720cru" rof_grid="MERITmz">
<!-- These mapping files were NOT created using ESMF as ESMF regridding failed, but with an offline python script -->
<!-- They were then converted to SCRIP mapping file format so they could be read by cime -->
Expand Down
88 changes: 0 additions & 88 deletions modelgrid_aliases_mct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<grid name="rof" compset="DWAV" >rx1</grid>
<grid name="rof" compset="RTM" >r05</grid>
<grid name="rof" compset="MOSART" >r05</grid>
<grid name="rof" compset="MIZUROUTE" >r05mz</grid>
<grid name="rof" compset="DROF" >rx1</grid>
<grid name="rof" compset="DROF%CPLHIST">r05</grid>
<grid name="rof" compset="XROF" >r05</grid>
Expand Down Expand Up @@ -99,20 +98,6 @@
<mask>5x5_amazon</mask>
</model_grid>

<model_grid alias="5x5_amazon_r05" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">5x5_amazon</grid>
<grid name="lnd">5x5_amazon</grid>
<grid name="rof">r05mz_amazon</grid>
<mask>5x5_amazon</mask>
</model_grid>

<model_grid alias="5x5_amazon_rHDMA" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">5x5_amazon</grid>
<grid name="lnd">5x5_amazon</grid>
<grid name="rof">HDMAmz_amazon</grid>
<mask>5x5_amazon</mask>
</model_grid>

<!-- Regional NLDAS-2 grid over the U.S. (0.125 degree resolution;
25-53N, 235-293E), with mask from NLDAS-2 atmospheric drivers -->
<model_grid alias="nldas2_rnldas2_mnldas2" compset="DATM.+CLM">
Expand All @@ -123,53 +108,13 @@
<mask>0.125nldas2</mask>
</model_grid>

<model_grid alias="nldas2_rUSGS_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">0.125nldas2</grid>
<grid name="lnd">0.125nldas2</grid>
<grid name="ocnice">0.125nldas2</grid>
<grid name="rof">USGS_GFmz</grid>
<mask>0.125nldas2</mask>
</model_grid>

<model_grid alias="nldas2_rHDMA_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">0.125nldas2</grid>
<grid name="lnd">0.125nldas2</grid>
<grid name="ocnice">0.125nldas2</grid>
<grid name="rof">HDMA_CONUSmz</grid>
<mask>0.125nldas2</mask>
</model_grid>

<model_grid alias="nldas2_rMERIT_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">0.125nldas2</grid>
<grid name="lnd">0.125nldas2</grid>
<grid name="ocnice">0.125nldas2</grid>
<grid name="rof">MERIT_CONUSmz</grid>
<mask>0.125nldas2</mask>
</model_grid>

<model_grid alias="hcru_hcru_mt13" not_compset="_POP" compset="DATM.+CLM">
<grid name="atm">360x720cru</grid>
<grid name="lnd">360x720cru</grid>
<grid name="ocnice">tx0.1v3</grid>
<mask>tx0.1v3</mask>
</model_grid>

<model_grid alias="hcru_hcru_mt13_rMERIT" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">360x720cru</grid>
<grid name="lnd">360x720cru</grid>
<grid name="ocnice">tx0.1v3</grid>
<grid name="rof">MERITmz</grid>
<mask>tx0.1v3</mask>
</model_grid>

<model_grid alias="hcru_hcru_mt13_rHDMA" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">360x720cru</grid>
<grid name="lnd">360x720cru</grid>
<grid name="ocnice">tx0.1v3</grid>
<grid name="rof">HDMAmz</grid>
<mask>tx0.1v3</mask>
</model_grid>

<!-- eulerian grids -->

<model_grid alias="T31_g37">
Expand Down Expand Up @@ -600,23 +545,6 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_f09_mg17_rHDMA" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
<grid name="rof">HDMAmz</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_f09_mg17_rMERIT" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
<grid name="rof">MERITmz</grid>
<mask>gx1v7</mask>
</model_grid>


<model_grid alias="f05_f05_mg17" not_compset="_POP" >
<grid name="atm">0.47x0.63</grid>
<grid name="lnd">0.47x0.63</grid>
Expand Down Expand Up @@ -706,22 +634,6 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_f19_mg17_rHDMA" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
<grid name="rof">HDMAmz</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_f19_mg17_rMERIT" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
<grid name="rof">MERITmz</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f45_g37">
<grid name="atm">4x5</grid>
<grid name="lnd">4x5</grid>
Expand Down
42 changes: 33 additions & 9 deletions modelgrid_aliases_nuopc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,23 +123,23 @@
<mask>0.125nldas2</mask>
</model_grid>

<model_grid alias="nldas2_rUSGS_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<model_grid alias="nldas2_nldas2_rUSGS_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">0.125nldas2</grid>
<grid name="lnd">0.125nldas2</grid>
<grid name="ocnice">0.125nldas2</grid>
<grid name="rof">USGS_GFmz</grid>
<mask>0.125nldas2</mask>
</model_grid>

<model_grid alias="nldas2_rHDMA_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<model_grid alias="nldas2_nldas2_rHDMA_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">0.125nldas2</grid>
<grid name="lnd">0.125nldas2</grid>
<grid name="ocnice">0.125nldas2</grid>
<grid name="rof">HDMA_CONUSmz</grid>
<mask>0.125nldas2</mask>
</model_grid>

<model_grid alias="nldas2_rMERIT_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<model_grid alias="nldas2_nldas2_rMERIT_mnldas2" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">0.125nldas2</grid>
<grid name="lnd">0.125nldas2</grid>
<grid name="ocnice">0.125nldas2</grid>
Expand All @@ -154,22 +154,30 @@
<mask>tx0.1v3</mask>
</model_grid>

<model_grid alias="hcru_hcru_mt13_rMERIT" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
<model_grid alias="hcru_hcru_rMERIT_mt13" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">360x720cru</grid>
<grid name="lnd">360x720cru</grid>
<grid name="ocnice">tx0.1v3</grid>
<grid name="rof">MERITmz</grid>
<mask>tx0.1v3</mask>
</model_grid>

<model_grid alias="hcru_hcru_mt13_rHDMA" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
<model_grid alias="hcru_hcru_rHDMA_mt13" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">360x720cru</grid>
<grid name="lnd">360x720cru</grid>
<grid name="ocnice">tx0.1v3</grid>
<grid name="rof">HDMAmz</grid>
<mask>tx0.1v3</mask>
</model_grid>

<model_grid alias="hcru_hcru_rHDMAlk_mt13" not_compset="_POP" compset="DATM.+CLM.+MIZUROUTE">
<grid name="atm">360x720cru</grid>
<grid name="lnd">360x720cru</grid>
<grid name="ocnice">tx0.1v3</grid>
<grid name="rof">HDMA_lake_mz</grid>
<mask>tx0.1v3</mask>
</model_grid>

<!-- eulerian grids -->

<model_grid alias="T31_g37">
Expand Down Expand Up @@ -593,15 +601,23 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_f09_mg17_rHDMA" not_compset="_POP" compset="MIZUROUTE">
<model_grid alias="f09_f09_rHDMA_mg17" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
<grid name="rof">HDMAmz</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_f09_mg17_rMERIT" not_compset="_POP" compset="MIZUROUTE">
<model_grid alias="f09_f09_rHDMAlk_mg17" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
<grid name="rof">HDMA_lake_mz</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f09_f09_rMERIT_mg17" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">0.9x1.25</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">0.9x1.25</grid>
Expand Down Expand Up @@ -699,15 +715,23 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_f19_mg17_rHDMA" not_compset="_POP" compset="MIZUROUTE">
<model_grid alias="f19_f19_rHDMA_mg17" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
<grid name="rof">HDMAmz</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_f19_mg17_rMERIT" not_compset="_POP" compset="MIZUROUTE">
<model_grid alias="f19_f19_rHDMAlk_mg17" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
<grid name="rof">HDMA_lake_mz</grid>
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f19_f19_rMERIT_mg17" not_compset="_POP" compset="MIZUROUTE">
<grid name="atm">1.9x2.5</grid>
<grid name="lnd">1.9x2.5</grid>
<grid name="ocnice">1.9x2.5</grid>
Expand Down