From aa0f10f6f99a11ed925fa0ffd2dc901df547f5d1 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Fri, 4 Nov 2016 16:19:56 -0600 Subject: [PATCH] Add settings for EC60to30v2 RRS30to10v2 grids --- cime/scripts/Tools/config_grid.xml | 121 +++++++++++++++++- .../namelist_definition_clm4_5.xml | 2 +- components/mpas-cice/bld/mpas-cice.buildnml | 15 +++ .../namelist_defaults_mpas-cice.xml | 2 + components/mpas-o/bld/mpas-o.buildnml | 18 +++ .../namelist_defaults_mpas-o.xml | 16 ++- 6 files changed, 168 insertions(+), 6 deletions(-) diff --git a/cime/scripts/Tools/config_grid.xml b/cime/scripts/Tools/config_grid.xml index 095f2412b2b5..eba4599a00a3 100644 --- a/cime/scripts/Tools/config_grid.xml +++ b/cime/scripts/Tools/config_grid.xml @@ -55,8 +55,10 @@ Each grid is associated with five names a%T62_l%T62_oi%oQU120_r%rx1_m%oQU120_g%null_w%null a%T62_l%T62_oi%mpasgx1_r%rx1_m%mpasgx1_g%null_w%null a%T62_l%T62_oi%oEC60to30_r%rx1_m%oEC60to30_g%null_w%null +a%T62_l%T62_oi%oEC60to30v2_r%rx1_m%oEC60to30v2_g%null_w%null a%T62_l%T62_oi%oEC60to30wLI_r%rx1_m%oEC60to30wLI_g%null_w%null a%T62_l%T62_oi%oRRS30to10_r%rx1_m%oRRS30to10_g%null_w%null +a%T62_l%T62_oi%oRRS30to10v2_r%rx1_m%oRRS30to10v2_g%null_w%null a%T62_l%T62_oi%oRRS30to10wLI_r%rx1_m%oRRS30to10wLI_g%null_w%null a%T62_l%T62_oi%oRRS18to6_r%rx1_m%oRRS18to6_g%null_w%null a%T62_l%T62_oi%oRRS15to5_r%rx1_m%oRRS15to5_g%null_w%null @@ -82,7 +84,7 @@ Each grid is associated with five names a%ne4np4_l%ne4np4_oi%oQU240_r%r05_m%oQU240_g%null_w%null -a%ne4np4_l%ne4np4_oi%oQU240wLI_r%r05_m%oQU240wLI_g%null_w%null +a%ne4np4_l%ne4np4_oi%oQU240wLI_r%r05_m%oQU240wLI_g%null_w%null a%ne11np4_l%ne11np4_oi%oQU240_r%r05_m%oQU240_g%null_w%null a%ne16np4_l%ne16np4_oi%oQU240_r%r05_m%oQU240_g%null_w%null a%ne16np4_l%ne16np4_oi%oQU240_r%r05_m%oQU240_g%mpas.ais20km_w%null @@ -91,10 +93,13 @@ Each grid is associated with five names a%ne30np4_l%ne30np4_oi%oQU120_r%r05_m%oQU120_g%null_w%null a%ne30np4_l%ne30np4_oi%oQU120_r%r05_m%oQU120_g%mpas.ais20km_w%null a%ne30np4_l%ne30np4_oi%oEC60to30_r%r05_m%oEC60to30_g%null_w%null +a%ne30np4_l%ne30np4_oi%oEC60to30v2_r%r05_m%oEC60to30v2_g%null_w%null a%ne30np4_l%ne30np4_oi%oEC60to30_ICG_r%r05_m%oEC60to30_g%null_w%null +a%ne30np4_l%ne30np4_oi%oEC60to30v2_ICG_r%r05_m%oEC60to30v2_g%null_w%null a%ne30np4_l%ne30np4_oi%oEC60to30wLI_r%r05_m%oEC60to30wLI_g%null_w%null a%ne30np4_l%ne30np4_oi%oRRS30to10_r%r05_m%oRRS30to10_g%null_w%null -a%ne30np4_l%ne30np4_oi%oRRS30to10wLI_r%r05_m%oRRS30to10wLI_g%null_w%null +a%ne30np4_l%ne30np4_oi%oRRS30to10v2_r%r05_m%oRRS30to10v2_g%null_w%null +a%ne30np4_l%ne30np4_oi%oRRS30to10wLI_r%r05_m%oRRS30to10wLI_g%null_w%null a%ne30np4_l%1.9x2.5_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null a%ne30np4_l%0.9x1.25_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null a%ne60np4_l%ne60np4_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null @@ -439,6 +444,18 @@ do not use scientific experiments; use the T62_g16 resolution instead: oEC60to30_ICG is a MPAS ocean grid with initial conditions, 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. This version of initial conditions is spun-up from a G compset run: + + Experimental, under development + 235446 1 + oEC60to30v2 is an 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: + + + + Experimental, under development + 235446 1 + oEC60to30_ICG is a MPAS ocean grid with initial conditions, 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. This version of initial conditions is spun-up from a G compset run: + + Experimental, under development 236689 1 @@ -451,6 +468,12 @@ do not use scientific experiments; use the T62_g16 resolution instead: oRRS30to10 is an MPAS ocean grid with a mesh density function that is roughly proportional to the Rossby radius of deformation, with 30 km gridcells at low and 10 km gridcells at high latitudes: + + Experimental, under development + 1447370 1 + oRRS30to10v2 is an MPAS ocean grid with a mesh density function that is roughly proportional to the Rossby radius of deformation, with 30 km gridcells at low and 10 km gridcells at high latitudes: + + Experimental, under development 1462411 1 @@ -627,6 +650,16 @@ do not use scientific experiments; use the T62_g16 resolution instead: domain.ocn.oEC60to30.150616.nc + + domain.ocn.oEC60to30v2.161011.nc + domain.ocn.oEC60to30v2.161011.nc + + + + domain.ocn.oEC60to30v2.161011.nc + domain.ocn.oEC60to30v2.161011.nc + + domain.ocn.oEC60to30wLI_mask.160830.nc domain.ocn.oEC60to30wLI_mask.160830.nc @@ -637,6 +670,11 @@ do not use scientific experiments; use the T62_g16 resolution instead: domain.ocn.oRRS30to10.150722.nc + + domain.ocn.oRRS30to10v2.161102.nc + domain.ocn.oRRS30to10v2.161102.nc + + domain.ocn.oRRS30to10wLI_mask.160930.nc domain.ocn.oRRS30to10wLI_mask.160930.nc @@ -1173,6 +1211,13 @@ do not use scientific experiments; use the T62_g16 resolution instead: domain.ocn.ne30np4_oEC60to30.20151214.nc + + domain.lnd.ne30np4_oEC60to30v2.161115.nc + domain.lnd.ne30np4_oEC60to30v2.161115.nc + domain.ocn.ne30np4_oEC60to30v2.161115.nc + domain.ocn.ne30np4_oEC60to30v2.161115.nc + + domain.lnd.ne30np4_oEC60to30wLI_mask.160915.nc domain.lnd.ne30np4_oEC60to30wLI_mask.160915.nc @@ -1187,6 +1232,13 @@ do not use scientific experiments; use the T62_g16 resolution instead: domain.ocn.ne30np4_oRRS30to10.160419.nc + + domain.lnd.ne30np4_oRRS30to10v2.999999.nc + domain.lnd.ne30np4_oRRS30to10v2.999999.nc + domain.ocn.ne30np4_oRRS30to10v2.999999.nc + domain.ocn.ne30np4_oRRS30to10v2.999999.nc + + domain.lnd.ne30np4_oRRS30to10wLI.160930.nc domain.lnd.ne30np4_oRRS30to10wLI.160930.nc @@ -1226,6 +1278,22 @@ do not use scientific experiments; use the T62_g16 resolution instead: cpl/gridmaps/oEC60to30/map_oEC60to30_TO_ne30np4_aave.151207.nc + + cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc + cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc + cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc + cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc + cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc + + + + cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc + cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc + cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30v2_aave.161115.nc + cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc + cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_to_ne30np4_aave.161115.nc + + cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30wLI_mask_aave.160915.nc cpl/gridmaps/ne30np4/map_ne30np4_to_oEC60to30wLI_nomask_aave.160915.nc @@ -1242,6 +1310,14 @@ do not use scientific experiments; use the T62_g16 resolution instead: cpl/gridmaps/oRRS30to10/map_oRRS30to10_to_ne30np4_aave.160419.nc + + cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10v2_aave.999999.nc + cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10v2_aave.999999.nc + cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10v2_aave.999999.nc + cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_to_ne30np4_aave.999999.nc + cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_to_ne30np4_aave.999999.nc + + cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10wLI_mask_aave.160930.nc cpl/gridmaps/ne30np4/map_ne30np4_to_oRRS30to10wLI_nomask_aave.160930.nc @@ -1480,6 +1556,11 @@ do not use scientific experiments; use the T62_g16 resolution instead: domain.lnd.T62_oEC60to30.150616.nc + + domain.lnd.T62_oEC60to30v2.161011.nc + domain.lnd.T62_oEC60to30v2.161011.nc + + domain.lnd.T62_oEC60to30wLI_mask.160830.nc domain.lnd.T62_oEC60to30wLI_mask.160830.nc @@ -1490,6 +1571,11 @@ do not use scientific experiments; use the T62_g16 resolution instead: domain.lnd.T62_oRRS30to10.150722.nc + + domain.lnd.T62_oRRS30to10v2.161102.nc + domain.lnd.T62_oRRS30to10v2.161102.nc + + domain.lnd.T62_oRRS30to10wLI_mask.160930.nc domain.lnd.T62_oRRS30to10wLI_mask.160930.nc @@ -1577,6 +1663,14 @@ do not use scientific experiments; use the T62_g16 resolution instead: cpl/gridmaps/oEC60to30/map_oEC60to30_TO_T62_aave.150615.nc + + cpl/gridmaps/T62/map_T62_TO_oEC60to30v2_aave.160920.nc + cpl/gridmaps/T62/map_T62_TO_oEC60to30v2_blin.160920.nc + cpl/gridmaps/T62/map_T62_TO_oEC60to30v2_patc.160920.nc + cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_TO_T62_aave.160920.nc + cpl/gridmaps/oEC60to30v2/map_oEC60to30v2_TO_T62_aave.160920.nc + + cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_aave.160830.nc cpl/gridmaps/T62/map_T62_TO_oEC60to30wLI_nm_aave.160830.nc @@ -1593,6 +1687,14 @@ do not use scientific experiments; use the T62_g16 resolution instead: cpl/gridmaps/oRRS30to10/map_oRRS30to10_TO_T62_aave.150722.nc + + cpl/gridmaps/T62/map_T62_TO_oRRS30to10v2_aave.161102.nc + cpl/gridmaps/T62/map_T62_TO_oRRS30to10v2_blin.161102.nc + cpl/gridmaps/T62/map_T62_TO_oRRS30to10v2_patc.161102.nc + cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_TO_T62_aave.161102.nc + cpl/gridmaps/oRRS30to10v2/map_oRRS30to10v2_TO_T62_aave.161102.nc + + cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_mask_aave.160930.nc cpl/gridmaps/T62/map_T62_TO_oRRS30to10wLI_nomask_aave.160930.nc @@ -1879,12 +1981,18 @@ do not use scientific experiments; use the T62_g16 resolution instead: cpl/cpl6/map_rx1_to_oEC60to30_nn.160527.nc + + cpl/cpl6/map_rx1_to_oEC60to30v2_smoothed.160920.nc + cpl/cpl6/map_rx1_to_oEC60to30wLI_nn.160830.nc cpl/cpl6/map_rx1_to_oRRS30to10_nn.160527.nc + + cpl/cpl6/map_rx1_to_oRRS30to10v2_nn.161102.nc + cpl/cpl6/map_rx1_to_oRRS30to10wLI_smoothed.r500e1000.160930.nc @@ -1923,12 +2031,21 @@ do not use scientific experiments; use the T62_g16 resolution instead: cpl/cpl6/map_r05_to_oEC60to30_smoothed.r175e350.160718.nc + + cpl/cpl6/map_r05_to_oEC60to30v2_smoothed.r300e600.161115.nc + + + cpl/cpl6/map_r05_to_oEC60to30v2_smoothed.r300e600.161115.nc + cpl/cpl6/map_r05_to_oEC60to30wLI_nn.160926.nc cpl/cpl6/map_r05_to_oRRS30to10_nn.160718.nc + + cpl/cpl6/map_r05_to_oRRS30to10v2_nn.161102.nc + cpl/cpl6/map_r05_to_oRRS30to10wLI_nn.160930.nc diff --git a/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml b/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml index cc6a33c2a079..ef4febfbd248 100644 --- a/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml +++ b/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml @@ -1122,7 +1122,7 @@ Representative concentration pathway for future scenarios [radiative forcing at + valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,cruncep,oEC60to30,oEC60to30v2,oEC60to30wLI,oRRS18to6,oRRS15to5,mp120v1,oQU240,oQU240wLI,oQU120,oRRS30to10,oRRS30to10v2,oRRS30to10wLI,360x720cru,NLDASww3a"> Land mask description diff --git a/components/mpas-cice/bld/mpas-cice.buildnml b/components/mpas-cice/bld/mpas-cice.buildnml index 9606710a8a0c..3e9ffe1ae747 100755 --- a/components/mpas-cice/bld/mpas-cice.buildnml +++ b/components/mpas-cice/bld/mpas-cice.buildnml @@ -54,6 +54,16 @@ if ( $ICE_GRID eq 'oEC60to30' ) { $grid_prefix = 'cice.EC60to30km.restartFrom_eos1b'; $decomp_date .= '151020'; $decomp_prefix .= 'mpas-cice.graph.info.'; +} elsif ( $ICE_GRID eq 'oEC60to30v2' ) { + $grid_date .= '160920'; + $grid_prefix .= 'cice.EC60to30v2'; + $decomp_date .= '160920'; + $decomp_prefix .= 'mpas-cice.graph.info.'; +} elsif ( $ICE_GRID eq 'oEC60to30v2_ICG' ) { + $grid_date .= '161116'; + $grid_prefix .= 'cice.EC60to30v2.restartFrom_grizzly02'; + $decomp_date .= '160920'; + $decomp_prefix .= 'mpas-cice.graph.info.'; } elsif ( $ICE_GRID eq 'oEC60to30wLI' ) { $grid_date .= '160830'; $grid_prefix .= 'cice.EC60to30wLI'; @@ -89,6 +99,11 @@ if ( $ICE_GRID eq 'oEC60to30' ) { $grid_prefix .= 'seaice.RRS.30-10km'; $decomp_date .= '151031'; $decomp_prefix .= 'mpas-cice.graph.info.'; +} elsif ( $ICE_GRID eq 'oRRS30to10v2' ) { + $grid_date .= '161102'; + $grid_prefix .= 'cice.RRS30to10v2'; + $decomp_date .= '161102'; + $decomp_prefix .= 'mpas-cice.graph.info.'; } elsif ( $ICE_GRID eq 'oRRS30to10wLI' ) { $grid_date .= '160930'; $grid_prefix .= 'seaice.RRS30-10wLI'; diff --git a/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml b/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml index a9f76ce9589a..77d5ab43ab51 100644 --- a/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml +++ b/components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml @@ -10,8 +10,10 @@ 3600.0 3600.0 1800.0 +1800.0 1800.0 900.0 +900.0 900.0 900.0 900.0 diff --git a/components/mpas-o/bld/mpas-o.buildnml b/components/mpas-o/bld/mpas-o.buildnml index 8456923e31f1..28a3c2f48b95 100755 --- a/components/mpas-o/bld/mpas-o.buildnml +++ b/components/mpas-o/bld/mpas-o.buildnml @@ -55,6 +55,18 @@ if ( $OCN_GRID eq 'oEC60to30' ) { $ic_date .= '160827'; $ic_prefix .= 'oEC60to30.restartFrom_eos1b'; $decomp_prefix .= 'mpas-o.graph.info.'; +} elsif ( $OCN_GRID eq 'oEC60to30v2' ) { + $grid_date .= '160920'; + $grid_prefix .= 'oEC60to30v2'; + $ic_date .= '160920'; + $ic_prefix .= 'oEC60to30v2'; + $decomp_prefix .= 'mpas-o.graph.info.'; +} elsif ( $OCN_GRID eq 'oEC60to30v2_ICG' ) { + $grid_date .= '160920'; + $grid_prefix .= 'oEC60to30v2'; + $ic_date .= '161116'; + $ic_prefix .= 'oEC60to30v2.restartFrom_grizzly02'; + $decomp_prefix .= 'mpas-o.graph.info.'; } elsif ( $OCN_GRID eq 'oEC60to30wLI' ) { $grid_date .= '160830'; $grid_prefix .= 'oEC60to30wLI'; @@ -91,6 +103,12 @@ if ( $OCN_GRID eq 'oEC60to30' ) { $grid_prefix .= 'ocean.RRS.30-10km'; $ic_prefix .= 'ocean.RRS.30-10km'; $decomp_prefix .= 'mpas-o.graph.info.'; +} elsif ( $OCN_GRID eq 'oRRS30to10v2' ) { + $grid_date .= '161102'; + $ic_date .= '161102'; + $grid_prefix .= 'oRRS30to10v2'; + $ic_prefix .= 'oRRS30to10v2'; + $decomp_prefix .= 'mpas-o.graph.info.'; } elsif ( $OCN_GRID eq 'oRRS30to10wLI' ) { $grid_date .= '160930'; $ic_date .= '160930'; diff --git a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml index 6e98e3d80647..0d5e787b7014 100644 --- a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml +++ b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml @@ -48,8 +48,10 @@ '02:00:00' '00:30:00' '00:15:00' +'00:30:00' '00:30:00' '00:06:00' +'00:10:00' '00:10:00' '00:06:00' '00:03:45' @@ -80,8 +82,10 @@ .false. .false. .true. +.true. .true. .true. +.true. .true. .true. .true. @@ -101,8 +105,10 @@ 2.0e14 2.6e13 4.0e11 +4.0e11 4.0e11 1.5e10 +1.5e10 1.5e10 3.2e09 1.9e09 @@ -120,9 +126,11 @@ .true. .true. .true. +.true. .true. -.true. -.true. +.false. +.false. +.false. .false. .false. .false. @@ -299,9 +307,11 @@ '0000_00:03:00' '0000_00:01:30' '0000_00:00:45' +'0000_00:00:45' '0000_00:00:45' '0000_00:00:18' -'0000_00:00:18' +'0000_00:00:24' +'0000_00:00:24' '0000_00:00:12' '0000_00:00:11.25' 2