diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index f3be69eafe..c46a86f92c 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -744,10 +744,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. -hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nec=10 do_transient_pfts=.false. - - hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false. @@ -1008,14 +1003,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case). >lnd/clm2/initdata_map/clmi.I1850Clm50BgcCrop-ciso.1366-01-01.0.9x1.25_gx1v7_simyr1850_c200428.nc -lnd/clm2/initdata_map/clmi.B1850Clm50BgcCrop.0161-01-01.0.9x1.25_gx1v7_simyr1850_c200729.nc - - - - - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_16pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_16pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_16pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_16pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_16pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_16pfts_CMIP6_2000_c230517.nc - + + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_2000_16pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_2000_16pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_2000_16pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_16pfts_CMIP6_2000_c230530.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_brazil_hist_2000_16pfts_cXXXXXX.nc - - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_5x5_amazon_hist_2000_16pfts_2000_cXXXXXX.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_2000_16pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa60_hist_2000_16pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa15_hist_2000_16pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa15-3_hist_2000_16pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa3p75_hist_2000_16pfts_c240130.nc - + + + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_2000_78pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_2000_78pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_2000_78pfts_c240130.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_78pfts_CMIP6_2000_c230517.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_brazil_hist_78pfts_CMIP6_2000_c231026.nc - - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_5x5_amazon_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_2000_78pfts_c240130.nc + + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_brazil_hist_2000_78pfts_c240201.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_5x5_amazon_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4_hist_2000_78pfts_c240131.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg2_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg2_hist_2000_78pfts_c240131.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne16np4_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg3_hist_2000_78pfts_c240131.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne16np4.pg3_hist_2000_78pfts_c240130.nc - - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.125nldas2_hist_16pfts_CMIP6_2000_c230517.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.125nldas2_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_360x720_78pfts_CMIP6_2000_cXXXXX.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_360x720cru_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_C96_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_C96_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_numaIA_hist_78pfts_CMIP6_2000_c231026.nc - - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_smallvilleIA_hist_78pfts_CMIP6_2000_c231026.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_numaIA_hist_2000_78pfts_c240201.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa480_hist_2000_78pfts_c231103.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa480_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa120_hist_2000_78pfts_c231026.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa60_hist_2000_16pfts_c231103.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa15_hist_2000_16pfts_c231026.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa15-conus_hist_2000_16pfts_c231026.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa3p75_hist_2000_16pfts_c231026.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa120_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne3np4.pg3_hist_2000_78pfts_c231103.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne16np4.pg3_hist_2000_78pfts_c231103.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4_hist_78pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg2_hist_78pfts_CMIP6_2000_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne3np4.pg3_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne120np4.pg3_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne120np4.pg3_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTICGRIS.ne30x8_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTICGRIS.ne30x8_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTIC.ne30x4_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTIC.ne30x4_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4CONUS.ne30x8_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4CONUS.ne30x8_hist_2000_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_vancouverCAN_hist_2000_78pfts_c240110.nc - +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_vancouverCAN_hist_2000_78pfts_c240201.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_mexicocityMEX_hist_2000_78pfts_c240110.nc - +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_mexicocityMEX_hist_2000_78pfts_c240201.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_urbanc_alpha_hist_2000_78pfts_c240110.nc - +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_urbanc_alpha_hist_2000_78pfts_c240201.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_360x720_78pfts_CMIP6_1850_cXXXXX.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_360x720cru_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa480_hist_1850_78pfts_c231103.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa480_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa120_hist_1850_78pfts_c231026.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_mpasa120_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4_hist_1850_78pfts_c240131.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg2_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240131.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c240131.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c231006.nc - - +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_C96_hist_78pfts_CMIP6_1850_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_78pfts_CMIP6_1850_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1.9x2.5_hist_78pfts_CMIP6_1850_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_78pfts_CMIP6_1850_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_4x5_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_C96_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_smallvilleIA_hist_78pfts_CMIP6_1850_c231026.nc - - -lnd/clm2/surfdata_esmf/ctsm5.2.0/ssurfdata_1x1_numaIA_hist_78pfts_CMIP6_1850_c240110.nc - - - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_brazil_hist_78pfts_CMIP6_1850_c231026.nc - +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_smallvilleIA_hist_1850_78pfts_c240201.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_1x1_brazil_hist_1850_78pfts_c240201.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c231103.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne16np4.pg3_hist_1850_78pfts_c231103.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4_hist_78pfts_CMIP6_1850_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg2_hist_78pfts_CMIP6_1850_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne30np4.pg3_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne16np4.pg3_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne120np4.pg3_hist_78pfts_CMIP6_1850_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne120np4.pg3_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTICGRIS.ne30x8_hist_1850_78pfts_c231103.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTICGRIS.ne30x8_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTIC.ne30x4_hist_78pfts_CMIP6_2000_c230517.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4.ARCTIC.ne30x4_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4CONUS.ne30x8_hist_1850_78pfts_c231103.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_ne0np4CONUS.ne30x8_hist_1850_78pfts_c240130.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_PtVeg_nourb_16pfts_cXXXXXX.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_PtVeg_nourb_16pfts_c240130.nc -lnd/clm2/surfdata_esmf/NEON/16PFT_mixed/surfdata_1x1_NEON_${NEONSITE}_hist_2000_16pfts_cXXXXXX.nc +lnd/clm2/surfdata_esmf/NEON/16PFT_mixed/surfdata_1x1_NEON_${NEONSITE}_hist_2000_16pfts_c240206.nc -lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_${NEONSITE}_hist_2000_78pfts_cXXXXXX.nc +lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_${NEONSITE}_hist_2000_78pfts_c240206.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c231103.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78_c231103.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_16pfts_cXXXXXX.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78pfts_c240130.nc + + +lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_SSP2-4.5_78_CMIP6_1850-2100_c230517.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_SSP2-4.5_1850-2100_78pfts_c240131.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_360x720cru_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_360x720cru_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_brazil_hist_78_CMIP6_1850-2015_c240110.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_numaIA_hist_1850-2015_78pfts_cXXXXXX.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_brazil_SSP2-4.5_1850-2100_78pfts_c240201.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c231026.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c231027.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne16np4.pg3_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne16np4.pg3_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np.pg3_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np4.pg3_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_C96_SSP2-4.5_1850-2100_78pfts_c231026.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_C96_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_smallvilleIA_hist_78_CMIP6_1850-1855_c240103.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_smallvilleIA_hist_1850-1855_78pfts_c240201.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP1-2.6_1850-2100_78pfts_c231103.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP1-2.6_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c231103.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78_c231103.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_16pfts_cXXXXXX.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_SSP2-4.5_78_CMIP6_1850-2100_c230517.nc - -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_360x720cru_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc + >lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78pfts_c240130.nc + + +lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_78pfts_c240130.nc +lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_SSP2-4.5_1850-2100_78pfts_c240131.nc + +lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_360x720cru_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_brazil_hist_78_CMIP6_1850-2015_c240110.nc -lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_numaIA_hist_1850-2015_78pfts_cXXXXXX.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_brazil_SSP2-4.5_1850-2100_78pfts_c240201.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c231026.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c231027.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne16np4.pg3_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne16np4.pg3_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np.pg3_SSP2-4.5_1850-2100_78pfts_cXXXXXX.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_ne30np4.pg3_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_C96_SSP2-4.5_1850-2100_78pfts_c231026.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_C96_SSP2-4.5_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP3-7.0_78_CMIP6_1850-2100_c230517.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP3-7.0_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP4-6.0_78_CMIP6_1850-2100_c230517.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP4-6.0_1850-2100_78pfts_c240130.nc lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP5-8.5_78_CMIP6_1850-2100_c230517.nc +>lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP5-8.5_1850-2100_78pfts_c240130.nc @@ -1911,8 +1852,7 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c .false. -.false. -.true. +.true. .false. .true. diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index 644e28a002..a393e6f56b 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile { # # Figure out number of tests that will run # -my $ntests = 2815; +my $ntests = 2587; if ( defined($opts{'compare'}) ) { - $ntests += 1965; + $ntests += 1737; } plan( tests=>$ntests ); @@ -433,7 +433,7 @@ sub cat_and_create_namelistinfile { "-res ne0np4CONUS.ne30x8 -bgc sp -use_case 2000_control -namelist '&a start_ymd=20130101/' -lnd_tuning_mode ${phys}_cam6.0", "-res 1.9x2.5 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=20030101/' -lnd_tuning_mode ${phys}_cam6.0", "-res 1.9x2.5 -bgc sp -use_case 2010_control -namelist '&a start_ymd=20100101/' -lnd_tuning_mode ${phys}_cam6.0", - "-res 1x1_brazil -bgc fates -no-megan -use_case 2000_control -lnd_tuning_mode ${phys}_CRUv7", + "-res 1x1_brazil -no-megan -use_case 2000_control -lnd_tuning_mode ${phys}_CRUv7", "-res C96 -bgc sp -use_case 2010_control -namelist '&a start_ymd=20100101/' -lnd_tuning_mode ${phys}_cam6.0", "-res ne0np4.ARCTIC.ne30x4 -bgc sp -use_case 2000_control -namelist '&a start_ymd=20130101/' -lnd_tuning_mode ${phys}_cam6.0", ) { @@ -1350,8 +1350,8 @@ sub cat_and_create_namelistinfile { print "========================================================================\n"; # Check for ALL resolutions with CLM50SP -my @resolutions = ( "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "360x720cru", "0.125nldas2", "10x15", "4x5", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4", "ne30np4.pg2", "ne30np4.pg3", "ne120np4.pg3", "ne0np4CONUS.ne30x8", "ne0np4.ARCTIC.ne30x4", "ne0np4.ARCTICGRIS.ne30x8", "C96", "mpasa480", "mpasa120", "mpasa60", "mpasa15", "mpasa15-conus", "mpasa3p75" ); -my @only2000_resolutions = ( "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "0.125nldas2", "mpasa60", "mpasa15", "mpasa15-conus", "mpasa3p75" ); +my @resolutions = ( "360x720cru", "10x15", "4x5", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4", "ne30np4.pg2", "ne30np4.pg3", "ne120np4.pg3", "ne0np4CONUS.ne30x8", "ne0np4.ARCTIC.ne30x4", "ne0np4.ARCTICGRIS.ne30x8", "C96", "mpasa480", "mpasa120" ); +my @only2000_resolutions = ( "1x1_numaIA", "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "0.125nldas2", "mpasa60", "mpasa15", "mpasa15-3", "mpasa3p75" ); my @regional; foreach my $res ( @resolutions ) { chomp($res); @@ -1449,7 +1449,24 @@ sub cat_and_create_namelistinfile { print "==================================================\n"; # Check for crop resolutions -my @crop_res = ( "1x1_numaIA", "1x1_smallvilleIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" ); +my $crop1850_res = "1x1_smallvilleIA"; +$options = "-bgc bgc -crop -res $crop1850_res -use_case 1850_control -envxml_dir ."; +&make_env_run(); +eval{ system( "$bldnml $options > $tempfile 2>&1 " ); }; +is( $@, '', "$options" ); +$cfiles->checkfilesexist( "$options", $mode ); +$cfiles->shownmldiff( "default", "standard" ); +if ( defined($opts{'compare'}) ) { + $cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode ); + $cfiles->dodiffonfile( "$real_par_file", "$options", $mode ); + $cfiles->comparefiles( "$options", $mode, $opts{'compare'} ); +} +if ( defined($opts{'generate'}) ) { + $cfiles->copyfiles( "$options", $mode ); +} +&cleanup(); + +my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" ); foreach my $res ( @crop_res ) { $options = "-bgc bgc -crop -res $res -envxml_dir ."; &make_env_run(); @@ -1673,7 +1690,7 @@ sub cat_and_create_namelistinfile { &cleanup(); # Run FATES mode for several resolutions and configurations my $clmoptions = "-bgc fates -envxml_dir . -no-megan"; - my @clmres = ( "1x1_brazil", "5x5_amazon", "4x5", "1.9x2.5" ); + my @clmres = ( "4x5", "1.9x2.5" ); foreach my $res ( @clmres ) { $options = "-res $res -clm_start_type cold"; my @edoptions = ( "-use_case 2000_control", diff --git a/cime_config/SystemTests/mksurfdataesmf.py b/cime_config/SystemTests/mksurfdataesmf.py index 12f904ae72..4e9800024e 100644 --- a/cime_config/SystemTests/mksurfdataesmf.py +++ b/cime_config/SystemTests/mksurfdataesmf.py @@ -38,11 +38,11 @@ def __init__(self, case): self._jobscript = os.path.join(self._get_caseroot(), "mksurfdata_jobscript_single") self._fsurdat_namelist = os.path.join( self._get_caseroot(), - f"surfdata_{self._res}_hist_78pfts_CMIP6_{self._model_yr}_c{time_stamp}.namelist", + f"surfdata_{self._res}_hist_{self._model_yr}_78pfts_c{time_stamp}.namelist", ) self._fsurdat_nc = os.path.join( self._get_caseroot(), - f"surfdata_{self._res}_hist_78pfts_CMIP6_{self._model_yr}_c{time_stamp}.nc", + f"surfdata_{self._res}_hist_{self._model_yr}_78pfts_c{time_stamp}.nc", ) self._TestStatus_log_path = os.path.join(self._get_caseroot(), "TestStatus.log") @@ -64,7 +64,7 @@ def build_phase(self, sharedlib_only=False, model_only=False): nml_script_path = os.path.join(self._tool_path, "gen_mksurfdata_namelist") gen_jobscript_path = os.path.join(self._tool_path, "gen_mksurfdata_jobscript_single") gen_mksurfdata_namelist = f"{nml_script_path} --res {self._res} --start-year {self._model_yr} --end-year {self._model_yr}" - gen_mksurfdata_jobscript = f"{gen_jobscript_path} --number-of-nodes 12 --tasks-per-node 12 --namelist-file {self._fsurdat_namelist}" + gen_mksurfdata_jobscript = f"{gen_jobscript_path} --number-of-nodes 1 --tasks-per-node 64 --namelist-file {self._fsurdat_namelist}" # Rm tool_bld and build executable that will generate fsurdat try: diff --git a/cime_config/SystemTests/rxcropmaturity.py b/cime_config/SystemTests/rxcropmaturity.py index 5d3b07bfbf..acb63bb000 100644 --- a/cime_config/SystemTests/rxcropmaturity.py +++ b/cime_config/SystemTests/rxcropmaturity.py @@ -328,6 +328,7 @@ def _create_config_file_evenlysplitcrop(self): cfg_out.write("PCT_GLACIER = 0.0\n") cfg_out.write("PCT_WETLAND = 0.0\n") cfg_out.write("PCT_LAKE = 0.0\n") + cfg_out.write("PCT_OCEAN = 0.0\n") cfg_out.write("PCT_URBAN = 0.0 0.0 0.0\n") def _run_check_rxboth_run(self): diff --git a/cime_config/buildnml b/cime_config/buildnml index 99ff61bc5d..69952c3968 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -85,7 +85,7 @@ def buildnml(case, caseroot, compname): "clm4_5_QIAN": "clm4_5_CRUv7", "clm4_5_NLDAS2": "clm4_5_CRUv7", "clm4_5_ERA5": "clm4_5_CRUv7", - "clm5_0_1PT": "clm5_0_GSWP3", + "clm5_0_1PT": "clm5_0_GSWP3v1", "clm5_0_QIAN": "clm5_0_GSWP3v1", "clm5_0_NLDAS2": "clm5_0_GSWP3v1", "clm5_0_ERA5": "clm5_0_GSWP3v1", diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index a24299855e..d1ccd918a7 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -28,6 +28,21 @@ --> + + + + FAIL + #2370 + + + + + + FAIL + Not opened yet but first posted here: https://github.com/ESCOMP/CTSM/pull/2318#discussion_r1484696000 + + + @@ -171,17 +186,10 @@ - - - PEND - #1045 - - - - PEND - #1045 + RUN + #2261 diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index ef5cac6f07..8a27ec31d1 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -13,8 +13,8 @@ - + @@ -32,24 +32,6 @@ - - - - - - - - - - - - - - - - - - @@ -126,7 +108,7 @@ - + @@ -198,7 +180,7 @@ - + @@ -207,7 +189,7 @@ - + @@ -471,8 +453,8 @@ - + @@ -567,6 +549,7 @@ + @@ -590,10 +573,9 @@ - - - + @@ -682,7 +645,7 @@ - + @@ -691,7 +654,7 @@ - + @@ -1254,24 +1217,6 @@ - - - - - - - - - - - - - - - - - - @@ -1352,42 +1297,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1397,24 +1306,6 @@ - - - - - - - - - - - - - - - - - - @@ -1648,7 +1539,7 @@ - + @@ -1777,7 +1668,7 @@ - + @@ -1786,7 +1677,7 @@ - + @@ -2343,9 +2234,7 @@ - - - + @@ -2455,20 +2344,6 @@ - - - - - - - - - - - - - - @@ -2627,15 +2502,6 @@ - - - - - - - - - @@ -2753,8 +2619,7 @@ - - + @@ -3569,20 +3434,26 @@ - + - + - + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/include_user_mods deleted file mode 100644 index 3e31b09d16..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../CLM1PTStartDate diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/shell_commands b/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/shell_commands deleted file mode 100755 index e410197c3d..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/shell_commands +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# shell commands to execute xmlchange commands written by PTCLMmkdata: which is now unsupported -./xmlchange CLM_USRDAT_NAME=1x1pt_US-UMB -./xmlchange DATM_CLMNCEP_YR_START=1999 -./xmlchange DATM_CLMNCEP_YR_END=2006 -# Comment this out if NINST_LND is greater than 1 (see: http://bugs.cgd.ucar.edu/show_bug.cgi?id=2521) -./xmlchange MPILIB=mpi-serial -./xmlchange ATM_DOMAIN_PATH='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB' -./xmlchange LND_DOMAIN_PATH='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB' -./xmlchange ATM_DOMAIN_FILE=domain.lnd.1x1pt_US-UMB_navy.171024.nc -./xmlchange LND_DOMAIN_FILE=domain.lnd.1x1pt_US-UMB_navy.171024.nc -./xmlchange --append CLM_BLDNML_OPTS='-mask navy -no-crop' -./xmlchange CALENDAR=GREGORIAN -./xmlchange DOUT_S=FALSE -./xmlchange ATM_NCPL=24 -./xmlchange RUN_STARTDATE=1999-01-01 -./xmlchange DATM_CLMNCEP_YR_ALIGN=1999 -./xmlchange DIN_LOC_ROOT_CLMFORC='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024' diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm deleted file mode 100644 index 8bb7848d49..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_mct/user_nl_clm +++ /dev/null @@ -1,4 +0,0 @@ -! user_nl_clm namelist options written by PTCLMmkdata, which is no longer available - fsurdat = '$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB/surfdata_1x1pt_US-UMB_16pfts_Irrig_CMIP6_simyr2000_c171024.nc' - hist_nhtfrq = 0 - hist_mfilt = 1200 diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/include_user_mods deleted file mode 100644 index 3e31b09d16..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/include_user_mods +++ /dev/null @@ -1 +0,0 @@ -../CLM1PTStartDate diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands b/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands deleted file mode 100755 index 43fe16a192..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/shell_commands +++ /dev/null @@ -1,15 +0,0 @@ -# shell commands to execute xmlchange commands written by PTCLMmkdata: which is now unsupported -./xmlchange CLM_USRDAT_NAME=1x1pt_US-UMB -./xmlchange DATM_YR_START=1999 -./xmlchange DATM_YR_END=2006 -# Comment this out if NINST_LND is greater than 1 (see: http://bugs.cgd.ucar.edu/show_bug.cgi?id=2521) -./xmlchange MPILIB=mpi-serial -./xmlchange --append CLM_BLDNML_OPTS='-mask navy -no-crop' -./xmlchange CALENDAR=GREGORIAN -./xmlchange DOUT_S=FALSE -./xmlchange ATM_NCPL=24 -./xmlchange RUN_STARTDATE=1999-01-01 -./xmlchange DATM_YR_ALIGN=1999 -./xmlchange DIN_LOC_ROOT_CLMFORC='$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024' -./xmlchange PTS_LON=275.2862 -./xmlchange PTS_LAT=45.5598 diff --git a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm deleted file mode 100644 index 8bb7848d49..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/USUMB_nuopc/user_nl_clm +++ /dev/null @@ -1,4 +0,0 @@ -! user_nl_clm namelist options written by PTCLMmkdata, which is no longer available - fsurdat = '$DIN_LOC_ROOT/lnd/clm2/PTCLMmydatafiles.c171024/1x1pt_US-UMB/surfdata_1x1pt_US-UMB_16pfts_Irrig_CMIP6_simyr2000_c171024.nc' - hist_nhtfrq = 0 - hist_mfilt = 1200 diff --git a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningMode_1979Start/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningMode_1979Start/include_user_mods index 1c3eece35d..aa76c52034 100644 --- a/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningMode_1979Start/include_user_mods +++ b/cime_config/testdefs/testmods_dirs/clm/clm51cam6LndTuningMode_1979Start/include_user_mods @@ -1 +1 @@ -../clm50cam6LndTuningMode +../clm51cam6LndTuningMode diff --git a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README index 68b1c6c106..32af224ce2 100644 --- a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README +++ b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README @@ -9,30 +9,16 @@ bld/namelist_files/namelist_defaults_ctsm.xml the following two files used in this test are default files for the following options: -fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_78pfts_CMIP6_1850_c230517.nc' +fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_1850_78pfts_c240130.nc' hgrid="10x15" sim_year="1850" use_crop=".false." irrigate=".true." hgrid="10x15" sim_year="1850" use_crop=".true." -<<<<<<< HEAD -flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_hist_78_CMIP6_1850-2015_c230601.nc' -hgrid="10x15" sim_year_range="1850-2000" irrigate=".true." use_vichydro=".true." -hgrid="10x15" sim_year_range="1850-2000" irrigate=".true." -hgrid="10x15" sim_year_range="1850-2000" use_vichydro=".false." -||||||| 576f14d5b -flanduse_timeseries = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc' -hgrid="10x15" sim_year_range="1850-2000" use_crop=".true." -hgrid="10x15" rcp="8.5" sim_year_range="1850-2100" use_crop=".true." -hgrid="10x15" rcp="6" sim_year_range="1850-2100" use_crop=".true." -hgrid="10x15" rcp="4.5" sim_year_range="1850-2100" use_crop=".true." -hgrid="10x15" rcp="2.6" sim_year_range="1850-2100" use_crop=".true." -======= -flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc' -hgrid="10x15" sim_year_range="1850-2000" use_crop=".true." -hgrid="10x15" rcp="8.5" sim_year_range="1850-2100" use_crop=".true." -hgrid="10x15" rcp="6" sim_year_range="1850-2100" use_crop=".true." -hgrid="10x15" rcp="4.5" sim_year_range="1850-2100" use_crop=".true." -hgrid="10x15" rcp="2.6" sim_year_range="1850-2100" use_crop=".true." ->>>>>>> ctsm5.1.dev163 +flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_SSP2-4.5_1850-2100_78pfts_c240131.nc' +-hgrid="10x15" sim_year_range="1850-2000" use_crop=".true." +-hgrid="10x15" rcp="8.5" sim_year_range="1850-2100" use_crop=".true." +-hgrid="10x15" rcp="6" sim_year_range="1850-2100" use_crop=".true." +-hgrid="10x15" rcp="4.5" sim_year_range="1850-2100" use_crop=".true." +-hgrid="10x15" rcp="2.6" sim_year_range="1850-2100" use_crop=".true." This test includes the settings of the decStart test so as to also test the end-of-year transition since it's an IHist case and transient vegetation gets diff --git a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm index 0bd2a29688..9778d139b4 100644 --- a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm @@ -1,2 +1,2 @@ -fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_78pfts_CMIP6_1850_c230517.nc' -flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_hist_78_CMIP6_1850-2015_c230601.nc' +fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_1850_78pfts_c240130.nc' +flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_SSP2-4.5_1850-2100_78pfts_c240131.nc' diff --git a/cime_config/testdefs/testmods_dirs/clm/f09_dec1990Start_GU_LULCC/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/f09_dec1990Start_GU_LULCC/user_nl_clm index 3b8eeaf33e..49b9f30104 100644 --- a/cime_config/testdefs/testmods_dirs/clm/f09_dec1990Start_GU_LULCC/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/f09_dec1990Start_GU_LULCC/user_nl_clm @@ -1,5 +1,5 @@ ! Specify a dataset that has non-zero Gross Unrepresented Land Use change fields on it ! And turn it on - flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_hist_78_CMIP6_1850-2015_c230601.nc' - fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_78pfts_CMIP6_1850_c230517.nc' + flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240130.nc' + fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_1850_78pfts_c240130.nc' do_grossunrep = .true. diff --git a/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm index 2ae2da1919..5c650032b7 100644 --- a/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/smallville_dynlakes_monthly/user_nl_clm @@ -1,8 +1,9 @@ do_transient_lakes = .true. -! This file was created with the following command: -! ncap2 -s 'PCT_LAKE=array(0.0,0.0,PCT_CROP); PCT_LAKE={0.,50.,25.,25.,25.,25.}; PCT_LAKE_MAX=array(50.,0.,AREA); PCT_CROP=array(0.0,0.0,PCT_LAKE); PCT_CROP={0.,25.,12.,12.,12.,12.}' landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_c160127.nc landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_dynLakes_c200928.nc +! The fsurdat and flanduse_timeseries files were created with the following script: +! tools/modify_input_files/modify_smallville.sh + ! Key points are that lake area starts as 0, increases after the first year, then decreases after the second year. ! PCT_CROP is also changed so that PCT_LAKE + PCT_CROP <= 100. (Here, PCT_CROP increases and decreases at the same time as PCT_LAKE in order to exercise the simultaneous increase or decrease of two landunits, but that isn't a critical part of this test.) ! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid. -flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_dynLakes_c200928.nc' +flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_smallvilleIA_hist_1850-1855_78pfts_dynLakes_c240201.nc' diff --git a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/modify_smallville_with_dynurban.ncl b/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/modify_smallville_with_dynurban.ncl deleted file mode 100644 index 5ac651b508..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/modify_smallville_with_dynurban.ncl +++ /dev/null @@ -1,72 +0,0 @@ -; NCL script -; modify_smallville_with_dynurban.ncl -; Keith Oleson, Dec 2021 -; Feb 23, 2022: Change HASURBAN to PCT_URBAN_MAX. The output file date has been updated from -; c211206 to c220223. -; Purpose is to create a transient landuse file for the smallville grid for dynamic urban testing -; ERS_Lm25.1x1_smallvilleIA.IHistClm50BgcCropQianRs.cheyenne_gnu.clm-smallville_dynurban_monthly -;************************************** - -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl" -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_csm.ncl" -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/contributed.ncl" -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/shea_util.ncl" - -begin - - print ("=========================================") - print ("Start Time: "+systemfunc("date") ) - print ("=========================================") - - infile = "/glade/campaign/cgd/tss/people/oleson/modify_surfdata/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_c160127.nc" - outfile = "/glade/campaign/cgd/tss/people/oleson/modify_surfdata/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_dynUrban_c220223.nc" - - system("cp " + infile + " " + outfile) - - outf = addfile(outfile,"w") - - numurbl = 3 - - pct_crop = outf->PCT_CROP - printVarSummary(pct_crop) - pct_urban = new((/dimsizes(pct_crop(:,0,0)),numurbl,dimsizes(pct_crop(0,:,0)),dimsizes(pct_crop(0,0,:))/),double,"No_FillValue") - pct_urban!0 = "time" - pct_urban&time = pct_crop&time - pct_urban!1 = "numurbl" - pct_urban!2 = pct_crop!1 - pct_urban!3 = pct_crop!2 - pct_urban@long_name = "percent urban for each density type (tbd, hd, md)" - pct_urban@units = "unitless" - printVarSummary(pct_urban) - - pct_urban(:,0,0,0) = (/0.d,20.d,10.d,10.d,10.d,10.d/) - pct_urban(:,1,0,0) = (/0.d,15.d, 8.d, 8.d, 8.d, 8.d/) -;pct_urban(:,2,0,0) = (/0.d,10.d, 5.d, 5.d, 5.d, 5.d/) - pct_urban(:,2,0,0) = (/0.d, 0.d, 0.d, 0.d, 0.d, 0.d/) - - pct_urban_max = new((/numurbl,dimsizes(pct_crop(0,:,0)),dimsizes(pct_crop(0,0,:))/),double,"No_FillValue") - pct_urban_max!0 = pct_urban!1 - pct_urban_max!1 = pct_urban!2 - pct_urban_max!2 = pct_urban!3 - pct_urban_max(0,:,:) = max(pct_urban(:,0,0,0)) - pct_urban_max(1,:,:) = max(pct_urban(:,1,0,0)) - pct_urban_max(2,:,:) = max(pct_urban(:,2,0,0)) - printVarSummary(pct_urban_max) - pct_urban_max@units = "unitless" - pct_urban_max@long_name = "maximum percent urban for each density type (tbd, hd, md)" - - pct_crop(:,0,0) = (/0.,25.,12.,12.,12.,12./) - - outf->PCT_URBAN_MAX = pct_urban_max - outf->PCT_URBAN = pct_urban - outf->PCT_CROP = pct_crop - - outf@history = "This file was created with the following NCL script: -/glade/campaign/cgd/tss/people/oleson/modify_surfdata/modify_smallville_with_dynurban.ncl. The file used as a template is: -/glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/surfdata_map/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_c160127.nc. Key points are that urban area starts as 0, increases after the first year, then decreases after the second year. Medium density urban is set to zero to test the memory-saving behavior of PCT_URBAN_MAX. PCT_CROP is also changed so that PCT_URBAN + PCT_CROP <= 100. (Here, PCT_CROP increases and decreases at the same time as PCT_URBAN in order to exercise the simultaneous increase or decrease of two landunits, but that isn't a critical part of this test.). Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid." - - print ("=========================================") - print ("Finish Time: "+systemfunc("date") ) - print ("=========================================") - -end diff --git a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm index 0ba93b1ee2..234b4d485f 100644 --- a/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly/user_nl_clm @@ -1,13 +1,10 @@ do_transient_urban = .true. -! The flanduse_timeseries file was created with the following NCL script (a copy of this script is in cime_config/testdefs/testmods_dirs/clm/smallville_dynurban_monthly): -! /glade/campaign/cgd/tss/people/oleson/modify_surfdata/modify_smallville_with_dynurban.ncl -! The file used as a template is: -! /glade/campaign/cgd/tss/people/oleson/modify_surfdata/lnd/clm2/surfdata_map/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_c160127.nc +! The fsurdat and flanduse_timeseries files were created with the following script: +! tools/modify_input_files/modify_smallville.sh + ! Key points are that urban area starts as 0, increases after the first year, then decreases after the second year. ! Medium density urban is set to zero to test the memory-saving behavior of PCT_URBAN_MAX. ! PCT_CROP is also changed so that PCT_URBAN + PCT_CROP <= 100. (Here, PCT_CROP increases and decreases at the same time as PCT_URBAN in order to exercise the simultaneous increase or decrease of two landunits, but that isn't a critical part of this test.) ! Note that the use of this file means that this testmod can only be used with the 1x1_smallvilleIA grid. -! Feb 23, 2022: Use updated file with HASURBAN replaced by PCT_URBAN_MAX -!flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_dynUrban_c220223.nc' -flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_1x1_smallvilleIA_hist_78pfts_simyr1850-1855_dynUrban_c220223.nc' +flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_1x1_smallvilleIA_hist_1850-1855_78pfts_dynUrban_c240201.nc' diff --git a/cime_config/usermods_dirs/NEON/FATES/defaults/user_nl_clm b/cime_config/usermods_dirs/NEON/FATES/defaults/user_nl_clm index 2a6b4d76d5..1a9847a69b 100644 --- a/cime_config/usermods_dirs/NEON/FATES/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/NEON/FATES/defaults/user_nl_clm @@ -19,7 +19,7 @@ !---------------------------------------------------------------------------------- flanduse_timeseries = ' ' ! This isn't needed for a non transient case, but will be once we start using transient compsets -fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_map/NEON/16PFT_mixed/surfdata_1x1_NEON_${NEONSITE}_hist_16pfts_Irrig_CMIP6_simyr2000_c230120.nc" +fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/NEON/16PFT_mixed/surfdata_1x1_NEON_${NEONSITE}_hist_2000_16pfts_c240206.nc" ! h1 output stream hist_fincl2 = 'FATES_AUTORESP','FCEV','FCTR','FGEV','FIRA','FSA','FSH','FATES_GPP','FATES_GPP_PF','H2OSOI', diff --git a/cime_config/usermods_dirs/NEON/defaults/user_nl_clm b/cime_config/usermods_dirs/NEON/defaults/user_nl_clm index 419ff0314c..b73da1f33e 100644 --- a/cime_config/usermods_dirs/NEON/defaults/user_nl_clm +++ b/cime_config/usermods_dirs/NEON/defaults/user_nl_clm @@ -19,7 +19,7 @@ !---------------------------------------------------------------------------------- flanduse_timeseries = ' ' ! This isn't needed for a non transient case, but will be once we start using transient compsets -fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_map/NEON/surfdata_1x1_NEON_${NEONSITE}_hist_78pfts_CMIP6_simyr2000_c230601.nc" +fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_${NEONSITE}_hist_2000_78pfts_c240206.nc" ! h1 output stream hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI', diff --git a/lilac/bld_templates/mosart_in b/lilac/bld_templates/mosart_in index 833e4f10f8..091ec69285 100644 --- a/lilac/bld_templates/mosart_in +++ b/lilac/bld_templates/mosart_in @@ -5,7 +5,7 @@ do_rtm = .true. do_rtmflood = .false. finidat_rtm = " " - frivinp_rtm = "/glade/p/cesmdata/cseg/inputdata/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc" + frivinp_rtm = "/glade/campaign/cesm/cesmdata/cseg/inputdata/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc" ice_runoff = .true. qgwl_runoff_option = "threshold" rtmhist_fexcl1 = "" diff --git a/python/ctsm/site_and_regional/modify_singlept_site_neon.py b/python/ctsm/site_and_regional/modify_singlept_site_neon.py index ae1318e2f8..932b033ad6 100755 --- a/python/ctsm/site_and_regional/modify_singlept_site_neon.py +++ b/python/ctsm/site_and_regional/modify_singlept_site_neon.py @@ -56,9 +56,10 @@ # -- valid neon sites -valid_neon_sites = glob.glob( +valid = glob.glob( os.path.join(path_to_ctsm_root(), "cime_config", "usermods_dirs", "NEON", "[!d]*") ) +valid_neon_sites = [x[-4:] for x in valid] # last 4 letters in each string def get_parser(): @@ -89,7 +90,7 @@ def get_parser(): dest="surf_dir", type=str, required=False, - default="/glade/scratch/" + myname + "/single_point/", + default="/glade/derecho/scratch/" + myname + "/single_point/", ) parser.add_argument( "--out_dir", @@ -101,7 +102,7 @@ def get_parser(): dest="out_dir", type=str, required=False, - default="/glade/scratch/" + myname + "/single_point_neon_updated/", + default="/glade/derecho/scratch/" + myname + "/single_point_neon_updated/", ) parser.add_argument( "--inputdata-dir", @@ -113,7 +114,7 @@ def get_parser(): dest="inputdatadir", type=str, required=False, - default="/glade/p/cesmdata/cseg/inputdata", + default="/glade/campaign/cesm/cesmdata/cseg/inputdata", ) parser.add_argument( "-d", @@ -220,9 +221,9 @@ def find_surffile(surf_dir, site_name, pft_16): """ if pft_16: - sf_name = "surfdata_1x1_NEON_" + site_name + "*hist_16pfts_Irrig_CMIP6_simyr2000_*.nc" + sf_name = "surfdata_1x1_NEON_" + site_name + "*hist_2000_16pfts*.nc" else: - sf_name = "surfdata_1x1_NEON_" + site_name + "*hist_78pfts_CMIP6_simyr2000_*.nc" + sf_name = "surfdata_1x1_NEON_" + site_name + "*hist_2000_78pfts*.nc" print(os.path.join(surf_dir, sf_name)) surf_file = sorted(glob.glob(os.path.join(surf_dir, sf_name))) @@ -279,7 +280,9 @@ def find_soil_structure(args, surf_file): # print (f_1.attrs["Soil_texture_raw_data_file_name"]) clm_input_dir = os.path.join(args.inputdatadir, "lnd/clm2/rawdata/") - surf_soildepth_file = os.path.join(clm_input_dir, f_1.attrs["Soil_texture_raw_data_file_name"]) + surf_soildepth_file = os.path.join( + clm_input_dir, f_1.attrs["soil_texture_lookup_raw_data_file_name"] + ) if os.path.exists(surf_soildepth_file): print( diff --git a/python/ctsm/subset_data.py b/python/ctsm/subset_data.py index 030cea2247..01053f6e1f 100644 --- a/python/ctsm/subset_data.py +++ b/python/ctsm/subset_data.py @@ -76,7 +76,7 @@ process_logging_args, ) -DEFAULTS_CONFIG = "tools/site_and_regional/default_data.cfg" +DEFAULTS_CONFIG = "tools/site_and_regional/default_data_2000.cfg" logger = logging.getLogger(__name__) diff --git a/python/ctsm/test/test_sys_regrid_ggcmi_shdates.py b/python/ctsm/test/test_sys_regrid_ggcmi_shdates.py index 7521ef09a5..4853a140c5 100755 --- a/python/ctsm/test/test_sys_regrid_ggcmi_shdates.py +++ b/python/ctsm/test/test_sys_regrid_ggcmi_shdates.py @@ -53,7 +53,7 @@ def setUp(self): # What is the complete set of input arguments (including script name)? regrid_template_file = os.path.join( - testinputs_path, "surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc" + testinputs_path, "surfdata_5x5_amazon_hist_16pfts_CMIP6_2000_c231031.nc" ) self._function_call_list = [ "regrid_ggcmi_shdates", diff --git a/python/ctsm/test/test_unit_subset_data.py b/python/ctsm/test/test_unit_subset_data.py index 37a7f84672..29271f6c8a 100755 --- a/python/ctsm/test/test_unit_subset_data.py +++ b/python/ctsm/test/test_unit_subset_data.py @@ -31,7 +31,9 @@ class TestSubsetData(unittest.TestCase): def setUp(self): sys.argv = ["subset_data", "point", "--create-surface"] - DEFAULTS_FILE = os.path.join(os.getcwd(), "ctsm/test/testinputs/default_data.cfg") + DEFAULTS_FILE = os.path.join( + os.getcwd(), "../tools/site_and_regional/default_data_2000.cfg" + ) self.parser = get_parser() self.args = self.parser.parse_args() self.cesmroot = path_to_ctsm_root() @@ -46,7 +48,7 @@ def test_inputdata_setup_files_basic(self): files = setup_files(self.args, self.defaults, self.cesmroot) self.assertEqual( files["fsurf_in"], - "surfdata_0.9x1.25_hist_16pfts_CMIP6_1850-2015_c231031.nc", + "surfdata_0.9x1.25_hist_2000_16pfts_c240130.nc", "fsurf_in filename not whats expected", ) self.assertEqual( diff --git a/python/ctsm/test/test_unit_utils_import_coord.py b/python/ctsm/test/test_unit_utils_import_coord.py index b7ec8f90ec..8e01f30c6e 100755 --- a/python/ctsm/test/test_unit_utils_import_coord.py +++ b/python/ctsm/test/test_unit_utils_import_coord.py @@ -46,7 +46,7 @@ def setUp(self): ) self._2d_lonlat_file = os.path.join( self._testinputs_path, - "surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214_modified.nc", + "surfdata_5x5_amazon_hist_16pfts_CMIP6_2000_c231031_modified.nc", ) def tearDown(self): diff --git a/python/ctsm/test/testinputs/mksurfdata_esmf_bld/.env_mach_specific.sh b/python/ctsm/test/testinputs/mksurfdata_esmf_bld/.env_mach_specific.sh index 7b797d907a..da0dc4f1bd 100644 --- a/python/ctsm/test/testinputs/mksurfdata_esmf_bld/.env_mach_specific.sh +++ b/python/ctsm/test/testinputs/mksurfdata_esmf_bld/.env_mach_specific.sh @@ -5,13 +5,12 @@ . /glade/u/apps/ch/opt/lmod/7.5.3/lmod/lmod/init/sh module purge module load ncarenv/1.3 python/3.7.9 cmake/3.22.0 intel/19.1.1 esmf_libs mkl -module use /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ +module use /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ module load esmf-8.4.1b02-ncdfio-mpt-O mpt/2.25 netcdf-mpi/4.9.0 pnetcdf/1.12.3 ncarcompilers/0.5.0 pio/2.5.10 export OMP_STACKSIZE=1024M -export TMPDIR=/glade/scratch/erik +export TMPDIR=/glade/derecho/scratch/erik export MPI_TYPE_DEPTH=16 export MPI_USE_ARRAY=None -export TMPDIR=/glade/scratch/erik export COMPILER=intel export MPILIB=mpt export DEBUG=FALSE diff --git a/python/ctsm/test/testinputs/mksurfdata_esmf_bld/env_mach_specific.xml b/python/ctsm/test/testinputs/mksurfdata_esmf_bld/env_mach_specific.xml index a718f1e2a5..0284ee1952 100644 --- a/python/ctsm/test/testinputs/mksurfdata_esmf_bld/env_mach_specific.xml +++ b/python/ctsm/test/testinputs/mksurfdata_esmf_bld/env_mach_specific.xml @@ -46,102 +46,102 @@ nvhpc/22.2 - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ esmf-8.4.1b02-ncdfio-mpt-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ esmf-8.4.1b02-ncdfio-mpt-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ esmf-8.4.1b02-ncdfio-openmpi-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ esmf-8.4.1b02-ncdfio-openmpi-O mpi-serial/2.3.0 - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ esmf-8.4.1b02-ncdfio-mpiuni-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/intel/19.1.1/ esmf-8.4.1b02-ncdfio-mpiuni-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ esmf-8.4.1b02-ncdfio-mpt-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ esmf-8.4.1b02-ncdfio-mpt-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ esmf-8.4.1b02-ncdfio-openmpi-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ esmf-8.4.1b02-ncdfio-openmpi-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ esmf-8.4.1b02-ncdfio-mpiuni-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/gnu/10.1.0/ esmf-8.4.1b02-ncdfio-mpiuni-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ esmf-8.2.0b23-ncdfio-mpt-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ esmf-8.2.0b23-ncdfio-mpt-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 esmf-8.4.1b02-ncdfio-mpt-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 esmf-8.4.1b02-ncdfio-mpt-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 esmf-8.4.1b02-ncdfio-openmpi-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 esmf-8.4.1b02-ncdfio-openmpi-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ esmf-8.2.0b23-ncdfio-openmpi-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ esmf-8.2.0b23-ncdfio-openmpi-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ esmf-8.2.0b23-ncdfio-mpiuni-g - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/pgi/20.4/ esmf-8.2.0b23-ncdfio-mpiuni-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 esmf-8.4.1.b01-ncdfio-mpiuni-O - /glade/p/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 + /glade/campaign/cesm/cesmdata/cseg/PROGS/modulefiles/esmfpkgs/nvhpc/22.2 esmf-8.4.1b02-ncdfio-mpiuni-O @@ -207,7 +207,7 @@ 1024M - /glade/scratch/$USER + /glade/derecho/scratch/$USER 16 @@ -224,7 +224,7 @@ false - /glade/scratch/$USER + /glade/derecho/scratch/$USER -1 diff --git a/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py b/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py index 148e5c2c35..5aece9d290 100755 --- a/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py +++ b/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py @@ -12,41 +12,45 @@ from ctsm.utils import abort valid_scenarios = [ + "global-potveg", "global-present", "global-present-low-res", "global-present-ultra-hi-res", - "global-present-nldas", - "global-hist-4x5", "crop-tropics-present", "crop", "crop-global-present", "crop-global-present-low-res", - "crop-global-present-ne16np4", - "crop-global-present-ne120np4", - "crop-global-present-0.125", + "crop-global-present-ne16", + "crop-global-present-ne30", + "crop-global-present-ne120", + "crop-global-present-mpasa480", + "crop-global-present-nldas", "crop-global-1850", "crop-global-1850-low-res", - "crop-global-1850-ne16np4", - "crop-global-1850-ne120np4", + "crop-global-1850-ne16", + "crop-global-1850-ne30", + "crop-global-1850-ne120", + "crop-global-1850-mpasa480", "crop-global-hist", - "crop-global-future", + "crop-global-hist-low-res", + "crop-global-hist-ne16", + "crop-global-hist-ne30", + "crop-global-SSP1-1.9-f09", "crop-global-SSP1-2.6-f09", - "crop-global-SSP3-7.0-f09", - "crop-global-SSP5-3.4-f09", "crop-global-SSP2-4.5-f09", "crop-global-SSP2-4.5-f19", "crop-global-SSP2-4.5-f10", "crop-global-SSP2-4.5-f45", "crop-global-SSP2-4.5-ne3", - "crop-global-SSP2-4.5-ne30", "crop-global-SSP2-4.5-ne16", + "crop-global-SSP2-4.5-ne30", "crop-global-SSP2-4.5-hcru", "crop-global-SSP2-4.5-C96", "crop-global-SSP2-4.5-mpasa120", - "crop-global-SSP2-4.5-hi-res", - "crop-global-SSP1-1.9-f09", + "crop-global-SSP3-7.0-f09", "crop-global-SSP4-3.4-f09", "crop-global-SSP4-6.0-f09", + "crop-global-SSP5-3.4-f09", "crop-global-SSP5-8.5-f09", ] @@ -73,7 +77,7 @@ def get_parser(): action="store", dest="account", required=False, - default="P93300606", + default="P93300641", ) parser.add_argument( "--bld-path", @@ -84,18 +88,18 @@ def get_parser(): ) parser.add_argument( "--number-of-nodes", - help="""number of cheyenne nodes requested (required)""", + help="""number of derecho nodes requested (required)""", action="store", dest="number_of_nodes", required=True, ) parser.add_argument( "--tasks-per-node", - help="""number of mpi tasks per node for cheyenne requested (default is 12)""", + help="""number of mpi tasks per node for derecho requested""", action="store", dest="tasks_per_node", required=False, - default="12", + default="128", ) parser.add_argument( "--walltime", @@ -111,7 +115,7 @@ def get_parser(): action="store", dest="queue", required=False, - default="regular", + default="main", ) parser.add_argument( "--scenario", @@ -123,7 +127,7 @@ def get_parser(): ) parser.add_argument( "--jobscript-file", - help="""output jobscript file to be submitted on cheyenne + help="""output jobscript file to be submitted with qsub [default: %(default)s]""", action="store", dest="jobscript_file", @@ -152,13 +156,7 @@ def main(): # -------------------------- # Determine target list # -------------------------- - target_list = [] - if scenario == "crop": - target_list = ["crop-global-present", "crop-global-1850"] - elif scenario == "tropics": - target_list = ["crop-tropics-present"] - else: - target_list = [scenario] + target_list = [scenario] # -------------------------- # Error checking @@ -168,6 +166,9 @@ def main(): abort("Input scenario is NOT in valid_scenarios") # -------------------------- # Determine resolution sets that are referenced in commands + # TODO slevis: When new resolutions become supported in ccs_config, the + # first entry will change to + # "standard_res_no_crop": ["0.9x1.25", "1.9x2.5", "mpasa60", "mpasa60-3conus", "mpasa60-3centralUS"], # -------------------------- resolution_dict = { "standard_res_no_crop": ["0.9x1.25", "1.9x2.5", "mpasa60"], @@ -178,23 +179,21 @@ def main(): "mpasa120": ["mpasa120"], "f10": ["10x15"], "f45": ["4x5"], + "low_res_no_crop": ["4x5", "10x15"], + "ultra_hi_res_no_crop": ["mpasa15", "mpasa15-3", "mpasa3p75"], + "standard_res": ["360x720cru", "0.9x1.25", "1.9x2.5", "C96", "mpasa120"], + "low_res": ["4x5", "10x15", "ne3np4.pg3"], + "mpasa480": ["mpasa480"], + "nldas_res": ["0.125nldas2"], + "5x5_amazon": ["5x5_amazon"], "ne3": ["ne3np4.pg3"], "ne16": ["ne16np4.pg3"], - "ne30": ["ne30np4.pg3"], - "low_res_no_crop": ["10x15"], - "ultra_hi_res_no_crop": ["mpasa15", "mpasa15-3conus", "mpasa3p75"], - "low_res_all": ["10x15", "ne3np4.pg3"], - "hi_res_all": ["ne120np4.pg3"], - "standard_res": ["360x720cru", "0.9x1.25", "1.9x2.5", "C96", "ne30np4.pg3", "mpasa120"], - "low_res": ["10x15", "4x5", "ne3np4.pg3", "mpasa480"], - "nldas_res": ["0.125nldas2"], - "5x5_amazon_res": ["5x5_amazon"], - "ne16np4_res": ["ne16np4.pg3"], - "ne120np4_res": [ - "ne120np4.pg3", + "ne30": ["ne30np4.pg3", "ne30np4.pg2", "ne30np4"], + "ne120": [ "ne0np4.ARCTICGRIS.ne30x8", "ne0np4.ARCTIC.ne30x4", "ne0np4CONUS.ne30x8", + "ne120np4.pg3", ], } @@ -202,44 +201,52 @@ def main(): # Determine commands for each target list # -------------------------- dataset_dict = { + "global-potveg": ( + "--start-year 1850 --end-year 1850 --nocrop --potveg --res", + "f09", + ), "global-present": ( - "--start-year 2000 --end-year 2000 --nocrop --vic --res", + "--start-year 2000 --end-year 2000 --nocrop --res", "standard_res_no_crop", ), "global-present-low-res": ( - "--start-year 2000 --end-year 2000 --nocrop --vic --res", + "--start-year 2000 --end-year 2000 --nocrop --res", "low_res_no_crop", ), "global-present-ultra-hi-res": ( "--start-year 2000 --end-year 2000 --nocrop --res", "ultra_hi_res_no_crop", ), - "global-present-nldas": ( - "--start-year 2000 --end-year 2000 --nocrop --vic --res", - "nldas_res", - ), "crop-tropics-present": ( "--start-year 2000 --end-year 2000 --res", - "5x5_amazon_res", + "5x5_amazon", ), "crop-global-present": ( - "--start-year 2000 --end-year 2000 --res", + "--start-year 2000 --end-year 2000 --vic --res", "standard_res", ), "crop-global-present-low-res": ( - "--start-year 2000 --end-year 2000 --res", + "--start-year 2000 --end-year 2000 --vic --res", "low_res", ), - "crop-global-present-ne16np4": ( + "crop-global-present-ne16": ( "--start-year 2000 --end-year 2000 --res", - "ne16np4_res", + "ne16", ), - "crop-global-present-ne120np4": ( + "crop-global-present-ne30": ( "--start-year 2000 --end-year 2000 --res", - "ne120np4_res", + "ne30", ), - "crop-global-present-0.125": ( - "--start-year 2000 --end-year 2000 --hirespft --res", + "crop-global-present-ne120": ( + "--start-year 2000 --end-year 2000 --res", + "ne120", + ), + "crop-global-present-mpasa480": ( + "--start-year 2000 --end-year 2000 --res", + "mpasa480", + ), + "crop-global-present-nldas": ( + "--start-year 2000 --end-year 2000 --res", # TODO slevis: --hirespft uses old data for now, so keep out "nldas_res", ), "crop-global-1850": ( @@ -250,18 +257,38 @@ def main(): "--start-year 1850 --end-year 1850 --res", "low_res", ), - "crop-global-1850-ne16np4": ( + "crop-global-1850-ne16": ( "--start-year 1850 --end-year 1850 --res", - "ne16np4_res", + "ne16", ), - "crop-global-1850-ne120np4": ( + "crop-global-1850-ne30": ( "--start-year 1850 --end-year 1850 --res", - "ne120np4_res", + "ne30", + ), + "crop-global-1850-ne120": ( + "--start-year 1850 --end-year 1850 --res", + "ne120", + ), + "crop-global-1850-mpasa480": ( + "--start-year 1850 --end-year 1850 --res", + "mpasa480", ), "crop-global-hist": ( "--start-year 1850 --end-year 2015 --nosurfdata --res", "standard_res", ), + "crop-global-hist-low-res": ( + "--start-year 1850 --end-year 2015 --nosurfdata --res", + "low_res", + ), + "crop-global-hist-ne16": ( + "--start-year 1850 --end-year 2015 --nosurfdata --res", + "ne16", + ), + "crop-global-hist-ne30": ( + "--start-year 1850 --end-year 2015 --nosurfdata --res", + "ne30", + ), "crop-global-SSP1-1.9-f09": ( "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP1-1.9 --res", "f09", @@ -286,6 +313,10 @@ def main(): "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res", "f10", ), + "crop-global-SSP2-4.5-f45": ( + "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res", + "f45", + ), "crop-global-SSP2-4.5-ne3": ( "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res", "ne3", @@ -306,10 +337,6 @@ def main(): "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res", "mpasa120", ), - "crop-global-SSP2-4.5-hi-res": ( - "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res", - "hi_res_all", - ), "crop-global-SSP3-7.0-f09": ( "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP3-7.0 --res", "f09", @@ -369,7 +396,7 @@ def main(): runfile.write(f"#PBS -q {queue} \n") runfile.write(f"#PBS -l walltime={walltime} \n") runfile.write( - f"#PBS -l select={number_of_nodes}:ncpus={tasks_per_node}:mpiprocs={tasks_per_node}:mem=109GB \n" + f"#PBS -l select={number_of_nodes}:ncpus={tasks_per_node}:mpiprocs={tasks_per_node}:mem=218GB \n" ) runfile.write( f"# This is a batch script to run a set of resolutions for mksurfdata_esmf {scenario} \n" @@ -401,7 +428,7 @@ def main(): sys.argv = [x for x in command.split(" ") if x] main_nml() print(f"generated namelist {namelist}") - output = f'time mpiexec_mpt -p "%g:" -np {n_p} {mksurfdata} < {namelist}' + output = f"time mpiexec {mksurfdata} < {namelist}" runfile.write(f"{output} \n") check = f"if [ $? != 0 ]; then echo 'Error running resolution {res}'; exit -4; fi" runfile.write(f"{check} \n") diff --git a/python/ctsm/toolchain/gen_mksurfdata_jobscript_single.py b/python/ctsm/toolchain/gen_mksurfdata_jobscript_single.py index bdb2c0fdcb..e0d6c32fee 100755 --- a/python/ctsm/toolchain/gen_mksurfdata_jobscript_single.py +++ b/python/ctsm/toolchain/gen_mksurfdata_jobscript_single.py @@ -38,11 +38,11 @@ def get_parser(): action="store", dest="account", required=False, - default="P93300606", + default="P93300641", ) parser.add_argument( "--number-of-nodes", - help="""number of cheyenne nodes requested (required)""", + help="""number of derecho nodes requested (required)""", action="store", dest="number_of_nodes", type=int, @@ -57,7 +57,7 @@ def get_parser(): ) parser.add_argument( "--tasks-per-node", - help="""number of mpi tasks per node for cheyenne requested (required)""", + help="""number of mpi tasks per node for derecho requested (required)""", action="store", dest="tasks_per_node", type=int, @@ -65,15 +65,15 @@ def get_parser(): ) parser.add_argument( "--machine", - help="""currently this recognizes cheyenne, casper, izumi (default + help="""currently this recognizes derecho, casper, izumi (default %(default)s); this needs to be a cime machine, i.e. a machine that has been ported to cime where you can build a cime model; for details see the README in this directory""", action="store", dest="machine", required=False, - choices=["cheyenne", "casper", "izumi"], - default="cheyenne", + choices=["derecho", "casper", "izumi"], + default="derecho", ) parser.add_argument( "--namelist-file", @@ -84,11 +84,11 @@ def get_parser(): ) parser.add_argument( "--jobscript-file", - help="""output jobscript file to be submitted on cheyenne (default: %(default)s)""", + help="""output jobscript file to be submitted with qsub (default: %(default)s)""", action="store", dest="jobscript_file", required=False, - default="mksurfdata_jobscript_single.sh", + default="mksurfdata_jobscript_single", ) return parser @@ -124,11 +124,11 @@ def main(): runfile.write("#PBS -j oe \n") runfile.write("#PBS -k eod \n") runfile.write("#PBS -S /bin/bash \n") - if machine == "cheyenne": + if machine == "derecho": attribs = {"mpilib": "default"} - runfile.write("#PBS -l walltime=30:00 \n") + runfile.write("#PBS -l walltime=59:00 \n") runfile.write(f"#PBS -A {account} \n") - runfile.write("#PBS -q regular \n") + runfile.write("#PBS -q main \n") runfile.write( f"#PBS -l select={number_of_nodes}:ncpus={tasks_per_node}:mpiprocs={tasks_per_node} \n" ) diff --git a/python/ctsm/toolchain/gen_mksurfdata_namelist.py b/python/ctsm/toolchain/gen_mksurfdata_namelist.py index 7893205763..9d6eecbc9d 100755 --- a/python/ctsm/toolchain/gen_mksurfdata_namelist.py +++ b/python/ctsm/toolchain/gen_mksurfdata_namelist.py @@ -164,7 +164,7 @@ def get_parser(): """, action="store", dest="input_path", - default="/glade/p/cesm/cseg/inputdata/", + default="/glade/campaign/cesm/cesmdata/inputdata/", ) parser.add_argument( "--vic", @@ -598,7 +598,10 @@ def main(): time_stamp = datetime.today().strftime("%y%m%d") if ssp_rcp == "none": - ssp_rcp_name = "hist" + if pft_years == "PtVg": + ssp_rcp_name = "PtVeg_nourb" + else: + ssp_rcp_name = "hist" else: ssp_rcp_name = ssp_rcp if int(end_year) == int(start_year): @@ -606,7 +609,7 @@ def main(): else: fdyndat = ( f"landuse.timeseries_{res}_{ssp_rcp_name}" - f"_{start_year}-{end_year}_{num_pft}_c{time_stamp}.nc" + f"_{start_year}-{end_year}_{num_pft}pfts_c{time_stamp}.nc" ) prefix = f"surfdata_{res}_{ssp_rcp_name}_{start_year}_{num_pft}pfts_c{time_stamp}." @@ -632,7 +635,7 @@ def main(): gitdescribe = subprocess.check_output("git describe", shell=True).strip() gitdescribe = gitdescribe.decode("utf-8") - # The below two overrides are only used for testing an validation + # The below two overrides are only used for testing and validation # it takes a long time to generate the mapping files # from 1km to the following two resolutions since the output mesh has so few points if res == "10x15": diff --git a/src/biogeochem/CNDVEstablishmentMod.F90 b/src/biogeochem/CNDVEstablishmentMod.F90 index 461b01b869..9606b7bbe2 100644 --- a/src/biogeochem/CNDVEstablishmentMod.F90 +++ b/src/biogeochem/CNDVEstablishmentMod.F90 @@ -55,6 +55,7 @@ subroutine Establishment(bounds, & ! ! !LOCAL VARIABLES: integer :: g,l,c,p,m ! indices + ! TODO slevis: Is begg - endg backwards in the next line? integer :: fn, filterg(bounds%begg-bounds%endg+1) ! local gridcell filter for error check ! ! gridcell level variables diff --git a/src/main/subgridWeightsMod.F90 b/src/main/subgridWeightsMod.F90 index 94c7fec504..45e7d32306 100644 --- a/src/main/subgridWeightsMod.F90 +++ b/src/main/subgridWeightsMod.F90 @@ -696,6 +696,10 @@ subroutine check_weights (bounds, active_only) write(iulog,*) 'The matching input grid cell had some non-zero-weight subgrid type' write(iulog,*) 'that is not present in memory in the new run.' write(iulog,*) ' ' + write(iulog,*) 'If you are using a ctsm5.2 or later fsurdat file containing' + write(iulog,*) 'PCT_OCEAN > 0, then you may solve the error by setting' + write(iulog,*) 'convert_ocean_to_land = .true.' + write(iulog,*) ' ' call endrun(msg=errMsg(sourcefile, __LINE__)) end if diff --git a/src/main/surfrdMod.F90 b/src/main/surfrdMod.F90 index 1bdd101d7e..e5a10f6698 100644 --- a/src/main/surfrdMod.F90 +++ b/src/main/surfrdMod.F90 @@ -416,7 +416,9 @@ subroutine surfrd_special(begg, endg, ncid, ns) call ncd_io(ncid=ncid, varname='PCT_OCEAN', flag='read', data=pctocn, & dim1name=grlnd, readvar=readvar) - if (.not. readvar) call endrun( msg=' ERROR: PCT_OCEAN NOT on surfdata file'//errMsg(sourcefile, __LINE__)) + if (.not. readvar) call endrun( msg= & + ' ERROR: PCT_OCEAN NOT on surfdata file but required when running ctsm5.2 or newer; ' // & + ' you are advised to generate a new surfdata file using the mksurfdata_esmf tool ' // errMsg(sourcefile, __LINE__)) call ncd_io(ncid=ncid, varname='PCT_WETLAND', flag='read', data=pctwet, & dim1name=grlnd, readvar=readvar) diff --git a/test/tools/nl_files/modify_data_YELL b/test/tools/nl_files/modify_data_YELL index 159c92ae63..0d180e8bf6 100644 --- a/test/tools/nl_files/modify_data_YELL +++ b/test/tools/nl_files/modify_data_YELL @@ -1 +1 @@ ---neon_site YELL --surf_dir CSMDATA/lnd/clm2/surfdata_map/NEON --out_dir EXEDIR --inputdata-dir CSMDATA +--neon_site YELL --surf_dir CSMDATA/lnd/clm2/surfdata_esmf/NEON --out_dir EXEDIR --inputdata-dir CSMDATA diff --git a/tools/contrib/run_clmtowers b/tools/contrib/run_clmtowers index 59b276260f..e4dd2519ff 100755 --- a/tools/contrib/run_clmtowers +++ b/tools/contrib/run_clmtowers @@ -48,13 +48,13 @@ else endif # Set location of your run directories -set rundata = /glade/scratch/oleson +set rundata = /glade/derecho/scratch/oleson # Set the location of your CLM tag set Clm_Tag_Dir = /glade/work/oleson/release-clm5.0.12 # Set the location of your surface datasets and shell commands that were generated by PTCLM. # This will not necessarily be in the same location as the CLM tag that you are running above -#set User_Mods_Dir = /glade/scratch/oleson/release-clm5.0.12 # This is my version for SP simulations -set User_Mods_Dir = /glade/scratch/oleson/release-clm5.0.12.BGC # This is my version for BGC simulations +#set User_Mods_Dir = /glade/derecho/scratch/oleson/release-clm5.0.12 # This is my version for SP simulations +set User_Mods_Dir = /glade/derecho/scratch/oleson/release-clm5.0.12.BGC # This is my version for BGC simulations # What sites to run? # These are the sites that can be evaluated with some combination of level 2 data and synthesis (gap-filled) data @@ -149,7 +149,7 @@ echo $sourcemods # Set some namelist options if required # If you set any of these you will need to also set them below (search on namelist_opts) -#set namelist_opts1 = "paramfile='/glade/p/cgd/tss/people/oleson/modify_param/CLM5_SP_ens_dec_5D_mcalib_psi50BET3_BETKr9_Cropkrmax5e-10_calmbboptleafcn.nc'" +#set namelist_opts1 = "paramfile='/glade/campaign/cgd/tss/people/oleson/modify_param/CLM5_SP_ens_dec_5D_mcalib_psi50BET3_BETKr9_Cropkrmax5e-10_calmbboptleafcn.nc'" #set namelist_opts2 = "baseflow_scalar= 0.001d00" # BGC #set namelist_opts3 = "pot_hmn_ign_counts_alpha= 0.012d00" diff --git a/tools/mksurfdata_esmf/Makefile b/tools/mksurfdata_esmf/Makefile index 60b3bb32b2..a0d5fa5445 100644 --- a/tools/mksurfdata_esmf/Makefile +++ b/tools/mksurfdata_esmf/Makefile @@ -1,16 +1,29 @@ # -*- mode:Makefile -*- # +# Before running "make urban-alpha" or any target that includes it, +# execute "module load nco" first. +# # To generate all surface data sets, run: -# make -f Makefile.data all +# make all +# +# To generate all surface data sets that use subset_data to be generated: +# make all-subset # # To generate a single dataset, run make with the name of the rule you # want to build. For example, to generate the crop data set for 1x1_numaIA: # -# make -f Makefile.data crop-numa +# make crop-numa # # NOTE: The default behavior is to parallelize data set creation using # the batch system by submitting jobs to the batch queue (on cheyenne). # +# In all cases where "--scenario $@" appears, the code executes the +# recipe for the specific target/scenario that it finds in +# ../../python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py +# There are a few grids mentioned explicitly here in the Makefile and +# many others that only appear in the gen_mksurfdata_jobscript_multi.py +# Look for resolutions or groups of resolutions in that python code. +# # Set up special characters null := @@ -46,6 +59,7 @@ SUBSETDATA_1X1_SMALL := --lat 40.6878 --lon 267.0228 --site 1x1_smallvilleIA \ --pctpft 6.5 1.5 1.6 1.7 1.8 1.9 1.5 1.6 1.7 1.8 1.9 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 1.5 # NOTE: The 1850 smallvilleIA site is constructed to start with 100% natural vegetation, so we can test transition to crops SUBSETDATA_1X1_SMALL1850 := --lat 40.6878 --lon 267.0228 --site 1x1_smallvilleIA --dompft 13 --pctpft 100 +SUBSETDATA_1X1_SMALLTRANSIENT := --lat 40.6878 --lon 267.0228 --site 1x1_smallvilleIA MEXICOCITY_TMP_FNAME := surfdata_1x1_mexicocityMEX_hist_2000_78pfts.nc MEXICOCITY_FNAME := surfdata_1x1_mexicocityMEX_hist_2000_78pfts_c$(CDATE).nc @@ -61,38 +75,44 @@ SUBSETDATA_1X1_URBALPHA := --lat -37.7308 --lon 0 --site 1x1_urbanc_alpha --o # ne120np4 and hi-res are for high resolution, ne16np4 is for mid-resolution testing # low-res is for low resolutions for testing # nldas is for NWP working with WRF +# STANDARD means no crop, so 16 pfts STANDARD = \ + global-potveg \ global-present \ global-present-low-res \ - global-present-nldas - -ULTRA_HIRES = \ - global-present-ultra-hi-res - -TROPICS = \ - crop-tropics-present CROP = \ crop-global-present \ crop-global-present-low-res \ - crop-global-present-ne16np4 \ - crop-global-present-ne120np4 \ + crop-global-present-ne16 \ + crop-global-present-ne30 \ + crop-global-present-ne120 \ + crop-global-present-mpasa480 \ + crop-global-present-nldas \ crop-global-1850 \ crop-global-1850-low-res \ - crop-global-1850-ne16np4 \ - crop-global-1850-ne120np4 \ - crop-global-future -all : standard tropics crop urban landuse-timeseries all-subset - + crop-global-1850-ne16 \ + crop-global-1850-ne30 \ + crop-global-1850-ne120 \ + crop-global-1850-mpasa480 \ + crop-global-future \ + +# Start all with all-subset because user is bound to forget to first run +# module load nco +# Usually, include global-present-ultra-hi-res temporarily while +# generating datasets for a new release +all : all-subset standard crop crop-tropics-present + +# These are all the surface datasets generated by subset_data +# This runs interactively and does not send jobs to the batch queue all-subset : \ - 1x1_brazil-tropics-present \ - crop-tropics-historical \ - crop-tropics-transient \ - crop-numa-present \ - crop-numa-historical \ - crop-smallville \ - crop-smallville-historical \ - urban-present urban-alpha + 1x1_brazil-present \ + 1x1_brazil-transient \ + 1x1-numa-present \ + 1x1-smallville-present \ + 1x1-smallville-1850 \ + 1x1-smallville-transient \ + urban DEBUG: @echo "HOST := $(HOST)" @@ -109,44 +129,38 @@ DEBUG: # standard : $(STANDARD) -global-present : FORCE - $(MKSURFDATA) --number-of-nodes 24 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +global-potveg : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -global-present-low-res : FORCE - $(MKSURFDATA) --number-of-nodes 10 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +global-present : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -global-present-nldas : FORCE - $(MKSURFDATA) --number-of-nodes 24 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +global-present-low-res : FORCE + $(MKSURFDATA) --number-of-nodes 1 --tasks-per-node 64 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh # # Ultra high resolutions (Don't do by default user should select this by hand) # -ultra_hires : $(ULTRA_HIRES) - global-present-ultra-hi-res : FORCE - $(MKSURFDATA) --number-of-nodes 200 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(MKSURFDATA) --number-of-nodes 50 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh # # tropics # -tropics : $(TROPICS) crop-tropics-present : FORCE - $(MKSURFDATA) --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(MKSURFDATA) --number-of-nodes 1 --tasks-per-node 5 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -1x1_brazil-tropics-present : FORCE +1x1_brazil-present : FORCE $(SUBSETDATA_POINT_ALLLU) --create-surface $(SUBSETDATA_1X1_BRAZIL) -crop-tropics-historical : FORCE - $(SUBSETDATA_POINT_ALLLU) --create-surface $(SUBSETDATA_1X1_BRAZIL) --cfg-file default_data_1850.cfg - -crop-tropics-transient : FORCE - $(SUBSETDATA_POINT_ALLLU) --create-landuse $(SUBSETDATA_1X1_BRAZIL) +1x1_brazil-transient : FORCE + $(SUBSETDATA_POINT_ALLLU) --create-surface --create-landuse $(SUBSETDATA_1X1_BRAZIL) --cfg-file ../site_and_regional/default_data_1850.cfg # # crop @@ -154,135 +168,183 @@ crop-tropics-transient : FORCE crop : $(CROP) crop-global-present : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh crop-global-present-low-res : FORCE - $(MKSURFDATA) --number-of-nodes 10 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(MKSURFDATA) --number-of-nodes 1 --tasks-per-node 64 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 + $(BATCHJOBS) $@.sh + +crop-global-present-ne16 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -crop-global-present-ne16np4 : FORCE - $(MKSURFDATA) --number-of-nodes 24 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +crop-global-present-ne30 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -crop-global-present-ne120np4 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +crop-global-present-ne120 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(BATCHJOBS) $@.sh + +crop-global-present-mpasa480 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(BATCHJOBS) $@.sh + +crop-global-present-nldas : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh crop-global-1850 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh crop-global-1850-low-res : FORCE - $(MKSURFDATA) --number-of-nodes 10 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(MKSURFDATA) --number-of-nodes 1 --tasks-per-node 64 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh -crop-global-1850-ne16np4 : FORCE - $(MKSURFDATA) --number-of-nodes 24 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +crop-global-1850-ne16 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -crop-global-1850-ne120np4 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +crop-global-1850-ne30 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -crop-global-present-0.125 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 +crop-global-1850-ne120 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 $(BATCHJOBS) $@.sh -crop-numa-present : FORCE - $(SUBSETDATA_POINT_ALLLU) --create-surface $(SUBSETDATA_1X1_NUMAIA) +crop-global-1850-mpasa480 : FORCE + $(MKSURFDATA) --number-of-nodes 4 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00 + $(BATCHJOBS) $@.sh + +crop-global-hist : FORCE + $(MKSURFDATA) --number-of-nodes 72 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 + $(BATCHJOBS) $@.sh -crop-numa-historical : FORCE - $(SUBSETDATA_POINT_ALLLU) --create-surface $(SUBSETDATA_1X1_NUMAIA) --cfg-file default_data_1850.cfg +crop-global-hist-low-res : FORCE + $(MKSURFDATA) --number-of-nodes 14 --tasks-per-node 32 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 + $(BATCHJOBS) $@.sh + +crop-global-hist-ne16 : FORCE + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 + $(BATCHJOBS) $@.sh -crop-smallville : FORCE +crop-global-hist-ne30 : FORCE + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 + $(BATCHJOBS) $@.sh + +1x1-numa-present : FORCE + $(SUBSETDATA_POINT_ALLLU) --create-surface $(SUBSETDATA_1X1_NUMAIA) + +1x1-smallville-present : FORCE $(SUBSETDATA_POINT) --create-surface $(SUBSETDATA_1X1_SMALL) # Note that the smallville 1850 dataset is entirely natural vegetation. This # facilitates testing a transient case that starts with no crop, and then later # adds crop (to make sure that it works properly to add crop in a grid cell # where there used to be no crop). -crop-smallville-historical : FORCE - $(SUBSETDATA_POINT) --create-surface $(SUBSETDATA_1X1_SMALL1850) --cfg-file default_data_1850.cfg +1x1-smallville-1850 : FORCE + $(SUBSETDATA_POINT) --create-surface $(SUBSETDATA_1X1_SMALL1850) --cfg-file ../site_and_regional/default_data_1850.cfg + +# Note (slevis): The next line makes the landuse.timeseries from 1850 to 2015, so also run +# modify_smallville.sh to generate three modified landuse.timeseries files needed for testing. +1x1-smallville-transient : FORCE + $(SUBSETDATA_POINT) --create-landuse $(SUBSETDATA_1X1_SMALLTRANSIENT) + ../modify_input_files/modify_smallville.sh # # Crop with future scenarios # -crop-global-future : crop-global-SSP1-1.9-f09 crop-global-SSP1-2.6-f09 crop-global-SSP2-4.5 crop-global-SSP2-4.5-low-res \ - crop-global-SSP3-7.0-f09 crop-global-SSP4-3.4-f09 crop-global-SSP4-6.0-f09 crop-global-SSP5-8.5-f09 -crop-global-SSP2-4.5-low-res : crop-global-SSP2-4.5-f10 crop-global-SSP2-4.5-ne3 -crop-global-SSP2-4.5 : crop-global-SSP2-4.5-f19 crop-global-SSP2-4.5-f09 crop-global-SSP2-4.5-f45 \ - crop-global-SSP2-4.5-hcru crop-global-SSP2-4.5-ne16 crop-global-SSP2-4.5-ne30 \ - crop-global-SSP2-4.5-C96 crop-global-SSP2-4.5-mpasa120 +crop-global-future : crop-global-SSP1-1.9-f09 \ + crop-global-SSP1-2.6-f09 \ + crop-global-SSP2-4.5 \ + crop-global-SSP2-4.5-low-res \ + crop-global-SSP3-7.0-f09 \ + crop-global-SSP4-3.4-f09 \ + crop-global-SSP4-6.0-f09 \ + crop-global-SSP5-8.5-f09 + +crop-global-SSP2-4.5-low-res : crop-global-SSP2-4.5-f10 \ + crop-global-SSP2-4.5-f45 \ + crop-global-SSP2-4.5-ne3 +crop-global-SSP2-4.5 : crop-global-SSP2-4.5-f09 \ + crop-global-SSP2-4.5-f19 \ + crop-global-SSP2-4.5-hcru \ + crop-global-SSP2-4.5-ne16 \ + crop-global-SSP2-4.5-ne30 \ + crop-global-SSP2-4.5-C96 \ + crop-global-SSP2-4.5-mpasa120 crop-global-SSP1-1.9-f09 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP1-2.6-f09 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-f09 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-f19 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 8 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 + $(BATCHJOBS) $@.sh + +crop-global-SSP2-4.5-f10 : FORCE + $(MKSURFDATA) --number-of-nodes 8 --tasks-per-node 16 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-f45 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 14 --tasks-per-node 32 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-hcru : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 72 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 + $(BATCHJOBS) $@.sh + +crop-global-SSP2-4.5-ne3 : FORCE + $(MKSURFDATA) --number-of-nodes 14 --tasks-per-node 32 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-ne16 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 8 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-ne30 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-C96 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP2-4.5-mpasa120 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 - $(BATCHJOBS) $@.sh - -crop-global-SSP2-4.5-f10 : FORCE - $(MKSURFDATA) --number-of-nodes 10 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 - $(BATCHJOBS) $@.sh - -crop-global-SSP2-4.5-ne3 : FORCE - $(MKSURFDATA) --number-of-nodes 10 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh # Don't do the high-resolution cases by default... crop-global-SSP2-4.5-hi-res : FORCE - $(MKSURFDATA) --number-of-nodes 96 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 6 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP3-7.0-f09 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP4-3.4-f09 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP4-6.0-f09 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh crop-global-SSP5-8.5-f09 : FORCE - $(MKSURFDATA) --number-of-nodes 48 --scenario $@ --jobscript-file $@.sh --walltime 02:00:00 + $(MKSURFDATA) --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00 $(BATCHJOBS) $@.sh # @@ -303,7 +365,7 @@ vancouver : FORCE $(RM) $(VANCOUVER_TMP_FNAME) # NOTE(bja, 2015-01) skip abort on invalid data necessary as of 2015-01. See -# /glade/p/cesm/cseg/inputdata/lnd/clm2/surfdata_map/README_c141219 +# /glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/surfdata_map/README_c141219 urban-alpha : FORCE $(SUBSETDATA_POINT_URBAN) --create-surface $(SUBSETDATA_1X1_URBALPHA) # Set number of nlevurb dimension to 4 for this site @@ -311,17 +373,6 @@ urban-alpha : FORCE $(MODIFYSURF) modify_1x1_urbanc_alpha.cfg -i $(URBALPHA_TMP2_FNAME) -o $(URBALPHA_FNAME) $(RM) $(URBALPHA_TMP_FNAME) $(URBALPHA_TMP2_FNAME) -# -# landuse timeseries with subset data -# -landuse-timeseries : landuse-timeseries-smallville -# NOTE: TODO: This needs to be chagned to use subset_data when transient configurations are resolved (see Issue #1673 -landuse-timeseries-smallville : FORCE -# $(MKSURFDATA) -no_surfdata -glc_nec 10 -y 1850-1855 -r 1x1_smallvilleIA \ -# -pft_idx 17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78 \ -# -pft_frc 6.5,1.5,1.6,1.7,1.8,1.9,1.5,1.6,1.7,1.8,1.9,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5 \ -# -dynpft single_point_dynpft_files/landuse_timeseries_smallvilleIA_hist_simyr1850-1855.txt \ -# $(BACKGROUND) # # clean up the working directory by removing generated files diff --git a/tools/mksurfdata_esmf/README b/tools/mksurfdata_esmf/README index 77b5025740..7aa5c92588 100644 --- a/tools/mksurfdata_esmf/README +++ b/tools/mksurfdata_esmf/README @@ -8,6 +8,7 @@ as a mesh file is available for the grid. The subset_data tool allows users to make fsurdat files from existing fsurdat files when a mesh file is unavailable. Generally, users should consider the subset_data tool for generating regional and single-point fsurdat files. + =================== Build Requirements: =================== @@ -58,7 +59,7 @@ Building the executable (working in tools/mksurfdata_esmf) # Before starting, be sure that you have run > ./manage_externals/checkout_externals -# because without it I have come across strange behavior, such as transient +# because without it we have come across strange behavior, such as transient # file generation (1850-2015) that aborts in the 1870s for no apparent reason. > ./gen_mksurfdata_build.sh # For machines with a cime build # Note: The pio_iotype value gets set and written to a simple .txt file @@ -86,7 +87,7 @@ Running for a single submission: # ./gen_mksurfdata_namelist finds all files. # to generate your target jobscript (again --help for instructions): -> ./gen_mksurfdata_jobscript_single --number-of-nodes 24 --tasks-per-node 12 --namelist-file target.namelist +> ./gen_mksurfdata_jobscript_single --number-of-nodes 2 --tasks-per-node 128 --namelist-file target.namelist > qsub mksurfdata_jobscript_single # Read note about regional grids below. @@ -95,11 +96,13 @@ Running for the generation of multiple datasets ======================= # Work in the ctsm_pylib environment, as explained in earlier section. # gen_mksurfdata_jobscript_multi runs ./gen_mksurfdata_namelist for you -# The regional grid 5x5_amazon may fail with 24 nodes. -# Task geometry that worked: #PBS -l select=4:ncpus=36:mpiprocs=4 > ./gen_mksurfdata_jobscript_multi --help -> ./gen_mksurfdata_jobscript_multi --number-of-nodes 24 --scenario all +> ./gen_mksurfdata_jobscript_multi --number-of-nodes 2 --scenario global-present > qsub mksurfdata_jobscript_multi +# If you are looking to generate all (or a large number of) the datasets or the +# single-point (1x1) datasets, you are best off using the Makefile. For example +> make all # ...or +> make all-subset ================ NOTES @@ -108,14 +111,11 @@ NOTES ------------------------------------ slevis HAS LISTED ISSUES ENCOUNTERED ------------------------------------ -REMEMBER TO compare against existing fsurdat files in -/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/release-clm5.0.18 0) New 30-sec raw data for soil texture fails. Try requesting more mem. 1) Soil color & texture and ag fire peak month outputs too high in .log TODO? Change frac_o from always 1. 2) Pct lake has chged in the .log bc the old diagnostic omitted mask_i frac_o 3) Slope, stddev have chged in the .log bc the old diag. used frac_o -4) 1x1_brazil min number-of-nodes tested: 4; 10x15 min tested: 3 -------------------------------------- ALL raw dataset .nc FILES MUST BE cdf5 diff --git a/tools/mksurfdata_esmf/gen_mksurfdata_build.sh b/tools/mksurfdata_esmf/gen_mksurfdata_build.sh index 90b94f6471..e9d0fcfb23 100755 --- a/tools/mksurfdata_esmf/gen_mksurfdata_build.sh +++ b/tools/mksurfdata_esmf/gen_mksurfdata_build.sh @@ -32,22 +32,18 @@ blddir=$cwd/tool_bld # may overwrite this default with command-line option (bel # May overwrite this default with command-line option --machine hostname=`hostname --short` case $hostname in - ##cheyenne - cheyenne* | r* ) - export MACH="cheyenne" + derecho* | r* ) + export MACH="derecho" pio_iotype=1 ;; - ##casper casper* ) export MACH="casper" pio_iotype=1 ;; - ##izumi izumi*) export MACH="izumi" pio_iotype=2 ;; - ##Hobart hobart*) export MACH="hobart" pio_iotype=2 diff --git a/tools/mksurfdata_esmf/src/CMakeLists.txt b/tools/mksurfdata_esmf/src/CMakeLists.txt index 7d845d27bf..2be063b976 100644 --- a/tools/mksurfdata_esmf/src/CMakeLists.txt +++ b/tools/mksurfdata_esmf/src/CMakeLists.txt @@ -50,8 +50,8 @@ set_property(TARGET pnetcdf PROPERTY IMPORTED_LOCATION $ENV{PNETCDF}) add_library(pioc STATIC IMPORTED) add_library(piof STATIC IMPORTED) -set_property(TARGET pioc PROPERTY IMPORTED_LOCATION $ENV{PIO}/lib/libpioc.a) -set_property(TARGET piof PROPERTY IMPORTED_LOCATION $ENV{PIO}/lib/libpiof.a) +set_property(TARGET pioc PROPERTY IMPORTED_LOCATION $ENV{PIO}/lib/libpioc.so) +set_property(TARGET piof PROPERTY IMPORTED_LOCATION $ENV{PIO}/lib/libpiof.so) add_executable(mksurfdata ${SRCFILES}) target_link_libraries(mksurfdata PRIVATE esmf piof pioc) target_include_directories (mksurfdata PRIVATE ${ESMF_F90COMPILEPATHS}) diff --git a/tools/mksurfdata_esmf/src/mksurfdata.F90 b/tools/mksurfdata_esmf/src/mksurfdata.F90 index abad3c39d4..35ff1807cd 100644 --- a/tools/mksurfdata_esmf/src/mksurfdata.F90 +++ b/tools/mksurfdata_esmf/src/mksurfdata.F90 @@ -1374,7 +1374,7 @@ subroutine normalize_and_check_landuse(ns_o) if (abs(suma - 100._r8) > tol_loose) then write(ndiag,*) subname, ' ERROR: landunits do not sum to 100%' write(ndiag,*) 'n, suma, pctlak, pctwet, pctgla, pcturb, pctnatveg, pctcrop, pctocn = ' - write(ndiag6,*) n, suma, pctlak(n), pctwet(n), pctgla(n), pcturb(n), & + write(ndiag,*) n, suma, pctlak(n), pctwet(n), pctgla(n), pcturb(n), & pctnatpft(n)%get_pct_l2g(), pctcft(n)%get_pct_l2g(), pctocn(n) flush(ndiag) call shr_sys_abort() diff --git a/tools/mksurfdata_esmf/src/mkurbanparMod.F90 b/tools/mksurfdata_esmf/src/mkurbanparMod.F90 index 05ec0cafe5..df4bfd43ba 100644 --- a/tools/mksurfdata_esmf/src/mkurbanparMod.F90 +++ b/tools/mksurfdata_esmf/src/mkurbanparMod.F90 @@ -796,7 +796,7 @@ subroutine lookup_and_check_err(pioid, varname, fill_val, check_invalid, & write(6,*) 'urban_classes_gcell_o(n,k): ', urban_classes_gcell_o(n,k) if (.not. urban_skip_abort_on_invalid_data_check) then ! NOTE(bja, 2015-01) added to work around a ?bug? noted in - ! /glade/p/cesm/cseg/inputdata/lnd/clm2/surfdata_map/README_c141219 + ! /glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/surfdata_map/README_c141219 call shr_sys_abort() end if end if diff --git a/tools/modify_input_files/modify_smallville.sh b/tools/modify_input_files/modify_smallville.sh new file mode 100755 index 0000000000..b88ac32ae9 --- /dev/null +++ b/tools/modify_input_files/modify_smallville.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Script that prepares landuse files for smallvilleIA. +# Load the nco module and run the script in the ctsm_pylib environment: +module load nco + +# This script runs from the mksurfdata_esmf/Makefile. +# When running standalone, it may need "subset_data_single_point/" in front +# of each landuse.timeseries file name. + file_to_2015="landuse.timeseries_1x1_smallvilleIA_hist_1850-2015_78pfts_c$(date +%y%m%d).nc" + file_to_1855="landuse.timeseries_1x1_smallvilleIA_hist_1850-1855_78pfts_c$(date +%y%m%d).nc" + file_lake="landuse.timeseries_1x1_smallvilleIA_hist_1850-1855_78pfts_dynLakes_c$(date +%y%m%d).nc" + file_urban="landuse.timeseries_1x1_smallvilleIA_hist_1850-1855_78pfts_dynUrban_c$(date +%y%m%d).nc" + file_pft="landuse.timeseries_1x1_smallvilleIA_hist_1850-1855_78pfts_dynPft_c$(date +%y%m%d).nc" + +# Trim the file to just the years 1850-1855 +ncks -d time,0,5 $file_to_2015 $file_to_1855 + +# Replace all values in the LAKE and CROP variables +ncap2 -s "PCT_LAKE=array(0.,0.,PCT_CROP); PCT_LAKE={0.,50.,25.,25.,25.,25.} ; PCT_LAKE_MAX=array(50.,50.,PCT_CROP_MAX); PCT_CROP=array(0.,0.,PCT_LAKE); PCT_CROP={0.,25.,12.,12.,12.,12.}; PCT_CROP_MAX=array(25.,25.,PCT_LAKE_MAX)" $file_to_1855 $file_lake + +# Replace all values in the URBAN and CROP variables +ncap2 -s "PCT_URBAN=array(0.,0.,PCT_URBAN); PCT_URBAN={0.,0.,0.,20.,15.,0.,10.,8.,0.,10.,8.,0.,10.,8.,0.,10.,8.,0.} ; PCT_URBAN_MAX=array(0.,0.,PCT_URBAN_MAX); PCT_URBAN_MAX={20.,15.,0.}; PCT_CROP=array(0.,0.,PCT_LAKE); PCT_CROP={0.,25.,12.,12.,12.,12.}; PCT_CROP_MAX=array(25.,25.,PCT_LAKE_MAX)" $file_to_1855 $file_urban + +# Update values in the pft, cft, harvest, and grazing variables as posted here: +# https://github.com/ESCOMP/CTSM/issues/1673#issuecomment-1879156989 +ncap2 -s "PCT_NAT_PFT=array(0.,0.,PCT_NAT_PFT); PCT_NAT_PFT={0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,100.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,100.,0.,100.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,100.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,50.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,50.,0.,25.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,75.,0.} ; PCT_NAT_PFT_MAX=array(0.,0.,PCT_NAT_PFT_MAX); PCT_NAT_PFT_MAX={100.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,100.,0.}; PCT_CFT=array(0.,0.,PCT_CFT); PCT_CFT={100.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,100.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,1.,1.,1.,1.,1.,1.,1.,1.,1.,91.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,91.,1.,1.,1.,1.,1.,1.,1.,1.,1.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,2.,4.,4.,6.,6.,8.,8.,10.,10.,42.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,4.,4.,4.,4.,4.,4.,4.,4.,4.,64.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.}; PCT_CFT_MAX=array(0.,0.,PCT_CFT_MAX); PCT_CFT_MAX={100.,2.,2.,3.,3.,4.,4.,5.,5.,91.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.}; PCT_CROP=array(0.,0.,PCT_CROP); PCT_CROP={0.,0.,100.,100.,50.,25.}; PCT_CROP_MAX=array(100.,100.,PCT_CROP_MAX); HARVEST_SH1=array(0.,0.,HARVEST_SH1); HARVEST_SH1={0.,0.,0.,0.,0.,0.}; HARVEST_SH2=array(0.,0.,HARVEST_SH2); HARVEST_SH2={0.,0.,0.,0.,0.,0.}; HARVEST_SH3=array(0.,0.,HARVEST_SH3); HARVEST_SH3={0.,0.,0.,0.,0.,0.}; HARVEST_VH1=array(0.,0.,HARVEST_VH1); HARVEST_VH1={0.,0.,0.,0.,0.,0.}; HARVEST_VH2=array(0.,0.,HARVEST_VH2); HARVEST_VH2={0.,0.,0.,0.,0.,0.}; GRAZING=array(0.,0.,GRAZING); GRAZING={0.,0.,0.,0.,0.,0.}" $file_to_1855 $file_pft + +exit diff --git a/tools/site_and_regional/default_data.cfg b/tools/site_and_regional/default_data_1850.cfg similarity index 60% rename from tools/site_and_regional/default_data.cfg rename to tools/site_and_regional/default_data_1850.cfg index 3a25d776a2..f631c87e4c 100644 --- a/tools/site_and_regional/default_data.cfg +++ b/tools/site_and_regional/default_data_1850.cfg @@ -1,5 +1,5 @@ [main] -clmforcingindir = /glade/campaign/cesm/cesmdata/cseg/inputdata +clmforcingindir = /glade/campaign/cesm/cesmdata/inputdata [datm_gswp3] dir = atm/datm7/atm_forcing.datm7.GSWP3.0.5d.v1.c170516 @@ -16,13 +16,12 @@ tpqwname = CLMGSWP3v1.TPQW [surfdat] dir = lnd/clm2/surfdata_esmf/ctsm5.2.0 -surfdat_16pft = surfdata_0.9x1.25_hist_16pfts_CMIP6_1850-2015_c231103.nc -surfdat_78pft = surfdata_0.9x1.25_hist_78pfts_CMIP6_1850-2015_c231031.nc +surfdat_78pft = surfdata_0.9x1.25_hist_1850_78pfts_c240130.nc [landuse] dir = lnd/clm2/surfdata_esmf/ctsm5.2.0 -landuse_16pft = landuse.timeseries_0.9x1.25_hist_16_CMIP6_1850-2015_c231103.nc -landuse_78pft = landuse.timeseries_0.9x1.25_hist_78_CMIP6_1850-2015_c231031.nc +landuse_78pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240130.nc [domain] file = share/domains/domain.lnd.fv0.9x1.25_gx1v7.151020.nc + diff --git a/python/ctsm/test/testinputs/default_data.cfg b/tools/site_and_regional/default_data_2000.cfg similarity index 67% rename from python/ctsm/test/testinputs/default_data.cfg rename to tools/site_and_regional/default_data_2000.cfg index 07557f271a..cfef3c5a5e 100644 --- a/python/ctsm/test/testinputs/default_data.cfg +++ b/tools/site_and_regional/default_data_2000.cfg @@ -16,13 +16,13 @@ tpqwname = CLMGSWP3v1.TPQW [surfdat] dir = lnd/clm2/surfdata_esmf/ctsm5.2.0 -surfdat_16pft = surfdata_0.9x1.25_hist_16pfts_CMIP6_1850-2015_c231031.nc -surfdat_78pft = surfdata_0.9x1.25_hist_78pfts_CMIP6_1850-2015_c231031.nc +surfdat_16pft = surfdata_0.9x1.25_hist_2000_16pfts_c240130.nc +surfdat_78pft = surfdata_0.9x1.25_hist_2000_78pfts_c240130.nc [landuse] dir = lnd/clm2/surfdata_esmf/ctsm5.2.0 -landuse_16pft = landuse.timeseries_0.9x1.25_hist_16_CMIP6_1850-2015_c231031.nc -landuse_78pft = landuse.timeseries_0.9x1.25_hist_78_CMIP6_1850-2015_c231031.nc +landuse_16pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240130.nc +landuse_78pft = landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240130.nc [domain] file = share/domains/domain.lnd.fv0.9x1.25_gx1v7.151020.nc