Skip to content

Commit

Permalink
Merge branch 'mark-petersen/add_EC60to30v3_with_land_ice_170724' (PR #…
Browse files Browse the repository at this point in the history 
…1665)

Add EC60to30v3wLI to grid and namelist files

This adds a new low resolution ocean/sea ice mesh. The wLI is "with
Land Ice" cavities in the ocean. This mesh is not involved in any tests,
so should be BFB.

Tested with:
* ERS_Ld5.T62_oQU120.CMPASO-NYF.cori-knl_gnu
* ERS_Ld5.T62_oQU120.GMPAS-NYF.cori-knl_gnu
* PEM_Ld5.T62_oQU120.GMPAS-NYF.cori-knl_gnu
* -compiler intel -mach theta -compset GMPAS-IAF -res T62_oEC60to30v3wL
* -compiler intel -mach theta -compset A_WCYCL1850 -res ne30_oECv3wLI
* -compiler intel -mach cori-knl -compset GMPAS-IAF -res
  T62_oEC60to30v3wLI
* -compiler intel -mach cori-knl -compset A_WCYCL1850 -res ne30_oECv3wLI

[BFB]
  • Loading branch information
@jonbob
jonbob committed Sep 22, 2017
2 parents 2da4c5c + 6045e09 commit bcb01f3
Showing 1 changed file with 52 additions and 2 deletions.
54 changes: 52 additions & 2 deletions config/acme/config_grids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@
<lname>a%T62_l%T62_oi%oEC60to30wLI_r%rx1_m%oEC60to30wLI_g%null_w%null</lname>
</grid>

<grid compset="(DATM|XATM|SATM)">
<sname>T62_oEC60to30v3wLI</sname>
<alias>T62_oEC60to30v3wLI</alias>
<lname>a%T62_l%T62_oi%oEC60to30v3wLI_r%rx1_m%oEC60to30v3wLI_g%null_w%null</lname>
</grid>

<grid compset="(DATM|XATM|SATM)">
<sname>T62_oRRS30to10</sname>
<alias>T62_oRRS30to10</alias>
Expand Down Expand Up @@ -754,6 +760,12 @@
<alias>ne30_oECwLI</alias>
</grid>

<grid>
<sname>ne30np4_oEC60to30v3wLI</sname>
<lname>a%ne30np4_l%ne30np4_oi%oEC60to30v3wLI_r%r05_m%oEC60to30v3wLI_g%null_w%null</lname>
<alias>ne30_oECv3wLI</alias>
</grid>

<grid>
<sname>ne30np4_oRRS30to10</sname>
<lname>a%ne30np4_l%ne30np4_oi%oRRS30to10_r%r05_m%oRRS30to10_g%null_w%null</lname>
Expand Down Expand Up @@ -1038,6 +1050,7 @@
<file atm_mask="oEC60to30">domain.lnd.T62_oEC60to30.150616.nc</file>
<file atm_mask="oEC60to30v3">domain.lnd.T62_oEC60to30v3.161222.nc</file>
<file atm_mask="oEC60to30wLI">domain.lnd.T62_oEC60to30wLI_mask.160830.nc</file>
<file atm_mask="oEC60to30v3wLI">domain.lnd.T62_oEC60to30v3wLI_mask.170328.nc</file>
<file atm_mask="oRRS30to10">domain.lnd.T62_oRRS30to10.150722.nc</file>
<file atm_mask="oRRS30to10v3">domain.lnd.T62_oRRS30to10v3.161221.nc</file>
<file atm_mask="oRRS30to10wLI">domain.lnd.T62_oRRS30to10wLI_mask.160930.nc</file>
Expand All @@ -1055,6 +1068,7 @@
<file lnd_mask="oEC60to30">domain.lnd.T62_oEC60to30.150616.nc</file>
<file lnd_mask="oEC60to30v3">domain.lnd.T62_oEC60to30v3.161222.nc</file>
<file lnd_mask="oEC60to30wLI">domain.lnd.T62_oEC60to30wLI_mask.160830.nc</file>
<file lnd_mask="oEC60to30v3wLI">domain.lnd.T62_oEC60to30v3wLI_mask.170328.nc</file>
<file lnd_mask="oRRS30to10">domain.lnd.T62_oRRS30to10.150722.nc</file>
<file lnd_mask="oRRS30to10v3">domain.lnd.T62_oRRS30to10v3.161221.nc</file>
<file lnd_mask="oRRS30to10wLI">domain.lnd.T62_oRRS30to10wLI_mask.160930.nc</file>
Expand Down Expand Up @@ -1126,27 +1140,31 @@
<file atm_mask="oEC60to30">domain.lnd.ne30np4_oEC60to30.20151214.nc</file>
<file atm_mask="oEC60to30v3">domain.lnd.ne30np4_oEC60to30v3.161222.nc</file>
<file atm_mask="oEC60to30wLI">domain.lnd.ne30np4_oEC60to30wLI_mask.160915.nc</file>
<file atm_mask="oEC60to30v3wLI">domain.lnd.ne30np4_oEC60to30v3wLI_mask.160915.nc</file>
<file atm_mask="oRRS30to10">domain.lnd.ne30np4_oRRS30to10.160419.nc</file>
<file atm_mask="oRRS30to10wLI">domain.lnd.ne30np4_oRRS30to10wLI.160930.nc</file>
<file ice_mask="gx1v6">domain.ocn.ne30np4_gx1v6_110217.nc</file>
<file ice_mask="oQU120">domain.ocn.ne30np4_oQU120.160401.nc</file>
<file ice_mask="oEC60to30">domain.ocn.ne30np4_oEC60to30.20151214.nc</file>
<file ice_mask="oEC60to30v3">domain.ocn.ne30np4_oEC60to30v3.161222.nc</file>
<file ice_mask="oEC60to30wLI">domain.ocn.ne30np4_oEC60to30wLI_mask.160915.nc</file>
<file ice_mask="oEC60to30v3wLI">domain.ocn.ne30np4_oEC60to30v3wLI_mask.160915.nc</file>
<file ice_mask="oRRS30to10">domain.ocn.ne30np4_oRRS30to10.160419.nc</file>
<file ice_mask="oRRS30to10wLI">domain.ocn.ne30np4_oRRS30to10wLI.160930.nc</file>
<file lnd_mask="gx1v6">domain.lnd.ne30np4_gx1v6.110905.nc</file>
<file lnd_mask="oQU120">domain.lnd.ne30np4_oQU120.160401.nc</file>
<file lnd_mask="oEC60to30">domain.lnd.ne30np4_oEC60to30.20151214.nc</file>
<file lnd_mask="oEC60to30v3">domain.lnd.ne30np4_oEC60to30v3.161222.nc</file>
<file lnd_mask="oEC60to30wLI">domain.lnd.ne30np4_oEC60to30wLI_mask.160915.nc</file>
<file lnd_mask="oEC60to30v3wLI">domain.lnd.ne30np4_oEC60to30v3wLI_mask.170802.nc</file>
<file lnd_mask="oRRS30to10">domain.lnd.ne30np4_oRRS30to10.160419.nc</file>
<file lnd_mask="oRRS30to10wLI">domain.lnd.ne30np4_oRRS30to10wLI.160930.nc</file>
<file ocn_mask="gx1v6">domain.ocn.ne30np4_gx1v6_110217.nc</file>
<file ocn_mask="oQU120">domain.ocn.ne30np4_oQU120.160401.nc</file>
<file ocn_mask="oEC60to30">domain.ocn.ne30np4_oEC60to30.20151214.nc</file>
<file ocn_mask="oEC60to30v3">domain.ocn.ne30np4_oEC60to30v3.161222.nc</file>
<file ocn_mask="oEC60to30wLI">domain.ocn.ne30np4_oEC60to30wLI_mask.160915.nc</file>
<file ocn_mask="oEC60to30v3wLI">domain.ocn.ne30np4_oEC60to30v3wLI_mask.160915.nc</file>
<file ocn_mask="oRRS30to10">domain.ocn.ne30np4_oRRS30to10.160419.nc</file>
<file ocn_mask="oRRS30to10wLI">domain.ocn.ne30np4_oRRS30to10wLI.160930.nc</file>
<desc>ne30np4 is Spectral Elem 1-deg grid:</desc>
Expand Down Expand Up @@ -1272,6 +1290,14 @@
<support>Experimental, under development</support>
</domain>

<domain name="oEC60to30v3wLI">
<nx>236358</nx> <ny>1</ny>
<file ice_mask="oEC60to30v3wLI">domain.ocn.oEC60to30v3wLI_nomask.170328.nc</file>
<file ocn_mask="oEC60to30v3wLI">domain.ocn.oEC60to30v3wLI_nomask.170328.nc</file>
<desc>oEC60to30v3wLI is a MPAS ocean grid generated with the eddy closure density function with 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. It is roughly comparable to the POP 1 degree resolution. Additionally, it has ocean under landice cavities:</desc>
<support>Experimental, under development</support>
</domain>

<domain name="oRRS30to10">
<nx>1444565</nx> <ny>1</ny>
<file ocn_mask="oRRS30to10">domain.ocn.oRRS30to10.150722.nc</file>
Expand Down Expand Up @@ -1680,6 +1706,13 @@
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_mask_to_ne30np4_aave.160915.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_mask_to_ne30np4_aave.160915.nc</OCN2ATM_SMAPNAME>
</gridmap>
<gridmap atm_grid="ne30np4" ocn_grid="oEC60to30v3wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v3wLI_mask_aave.170802.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v3wLI_mask_conserve.170802.nc</ATM2OCN_VMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v3wLI_nomask_bilin.170802.nc</ATM2OCN_SMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_mask_to_ne30np4_aave.170802.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_mask_to_ne30np4_bilin.170802.nc</OCN2ATM_SMAPNAME>
</gridmap>
<gridmap atm_grid="ne30np4" ocn_grid="oRRS30to10wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_VMAPNAME>
Expand Down Expand Up @@ -1871,10 +1904,17 @@
<gridmap atm_grid="T62" ocn_grid="oEC60to30wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_aave.160830.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_nm_aave.160830.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_aave.160830.nc</ATM2OCN_VMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_blin.160830.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_TO_T62_aave.160830.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30wLI/map_oEC60to30wLI_TO_T62_aave.160830.nc</OCN2ATM_SMAPNAME>
</gridmap>
<gridmap atm_grid="T62" ocn_grid="oEC60to30v3wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30v3wLI_mask_aave.170328.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30v3wLI_nomask_blin.170328.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oEC60to30v3wLI_mask_patc.170328.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_mask_TO_T62_aave.170328.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_mask_TO_T62_aave.170328.nc</OCN2ATM_SMAPNAME>
</gridmap>
<gridmap atm_grid="T62" ocn_grid="oRRS30to10">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10_aave.150722.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10_blin.150722.nc</ATM2OCN_SMAPNAME>
Expand All @@ -1892,7 +1932,7 @@
<gridmap atm_grid="T62" ocn_grid="oRRS30to10wLI">
<ATM2OCN_FMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_nomask_aave.160930.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_mask_aave.160930.nc</ATM2OCN_VMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_mask_blin.160930.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/oRRS30to10wLI/map_oRRS30to10wLI_mask_TO_T62_aave.160930.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/oRRS30to10wLI/map_oRRS30to10wLI_mask_TO_T62_aave.160930.nc</OCN2ATM_SMAPNAME>
</gridmap>
Expand Down Expand Up @@ -2211,6 +2251,11 @@
<ROF2OCN_LIQ_RMAPNAME >cpl/cpl6/map_rx1_to_oEC60to30wLI_nn.160830.nc</ROF2OCN_LIQ_RMAPNAME>
</gridmap>

<gridmap rof_grid="rx1" ocn_grid="oEC60to30v3wLI" >
<ROF2OCN_ICE_RMAPNAME >cpl/cpl6/map_rx1_to_oEC60to30v3wLI_smoothed.r300e600.170328.nc</ROF2OCN_ICE_RMAPNAME>
<ROF2OCN_LIQ_RMAPNAME >cpl/cpl6/map_rx1_to_oEC60to30v3wLI_smoothed.r300e600.170328.nc</ROF2OCN_LIQ_RMAPNAME>
</gridmap>

<gridmap rof_grid="rx1" ocn_grid="oRRS30to10" >
<ROF2OCN_ICE_RMAPNAME >cpl/cpl6/map_rx1_to_oRRS30to10_nn.160527.nc</ROF2OCN_ICE_RMAPNAME>
<ROF2OCN_LIQ_RMAPNAME >cpl/cpl6/map_rx1_to_oRRS30to10_nn.160527.nc</ROF2OCN_LIQ_RMAPNAME>
Expand Down Expand Up @@ -2281,6 +2326,11 @@
<ROF2OCN_LIQ_RMAPNAME >cpl/cpl6/map_r05_to_oEC60to30wLI_smoothed.r300e600.160926.nc</ROF2OCN_LIQ_RMAPNAME>
</gridmap>

<gridmap rof_grid="r05" ocn_grid="oEC60to30v3wLI" >
<ROF2OCN_ICE_RMAPNAME >cpl/cpl6/map_r05_to_oEC60to30v3wLI_smoothed.r300e600.170802.nc</ROF2OCN_ICE_RMAPNAME>
<ROF2OCN_LIQ_RMAPNAME >cpl/cpl6/map_r05_to_oEC60to30v3wLI_smoothed.r300e600.170802.nc</ROF2OCN_LIQ_RMAPNAME>
</gridmap>

<gridmap rof_grid="r05" ocn_grid="oRRS30to10" >
<ROF2OCN_ICE_RMAPNAME >cpl/cpl6/map_r05_to_oRRS30to10_nn.160718.nc</ROF2OCN_ICE_RMAPNAME>
<ROF2OCN_LIQ_RMAPNAME >cpl/cpl6/map_r05_to_oRRS30to10_nn.160718.nc</ROF2OCN_LIQ_RMAPNAME>
Expand Down

0 comments on commit bcb01f3

Please sign in to comment.