From bb98fa5fb4a89888c9bf1982701a9639a7d96807 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 28 Mar 2019 19:54:14 -0600 Subject: [PATCH 01/29] Add nldas grid: step 1 Define the scrip grid file for the new nldas grid, and add the nldas grid and associated mask as valid options. --- bld/namelist_files/checkmapfiles.ncl | 2 +- bld/namelist_files/namelist_defaults_ctsm_tools.xml | 1 + bld/namelist_files/namelist_defaults_overall.xml | 1 + bld/namelist_files/namelist_definition_ctsm.xml | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bld/namelist_files/checkmapfiles.ncl b/bld/namelist_files/checkmapfiles.ncl index 6302615d1c..6c3ef69537 100644 --- a/bld/namelist_files/checkmapfiles.ncl +++ b/bld/namelist_files/checkmapfiles.ncl @@ -9,7 +9,7 @@ ; print( "Check that datm mapping files are consistent" ); - resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /); + resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "nldas", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /); space = " "; badres = 0 diff --git a/bld/namelist_files/namelist_defaults_ctsm_tools.xml b/bld/namelist_files/namelist_defaults_ctsm_tools.xml index 0683f52b88..b40d9f04bb 100644 --- a/bld/namelist_files/namelist_defaults_ctsm_tools.xml +++ b/bld/namelist_files/namelist_defaults_ctsm_tools.xml @@ -107,6 +107,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). landmesh +lnd/clm2/mappingdata/grids/SCRIPgrid_nldas_nomask_c190328.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_brazil_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml index 0edaa1dd76..3a20ba26aa 100644 --- a/bld/namelist_files/namelist_defaults_overall.xml +++ b/bld/namelist_files/namelist_defaults_overall.xml @@ -75,6 +75,7 @@ determine default values for namelists. gx1v6 gx1v6 +nldas navy navy navy diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index ed25f93798..cdbb6b4cfd 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -1794,7 +1794,7 @@ CLM run type. +"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,nldas,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min"> Horizontal resolutions Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools @@ -1816,7 +1816,7 @@ hist means do NOT use a future scenario, just use historical data. + valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx1v1,T62,cruncep,nldas"> Land mask description From 3383c41ee6db6064404e88e3ce0f1ef49203983a Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 28 Mar 2019 20:32:06 -0600 Subject: [PATCH 02/29] Point to more recent esmf version ESMF version 7.0.0 has a bug that is fixed in 7.1.0r. Fixes ESCOMP/ctsm#642 --- tools/mkmapdata/README | 4 ++-- tools/mkmapdata/mkmapdata.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/mkmapdata/README b/tools/mkmapdata/README index b865e72f2d..3f5e9e92c2 100644 --- a/tools/mkmapdata/README +++ b/tools/mkmapdata/README @@ -12,7 +12,7 @@ two versions, one with mpiuni and one with mpi. Both versions also need to be built with NetCDF rather than the default IO version. -Currently uses: ESMF7.0.0 +Currently uses: ESMF7.1.0r Do the following for help with the different options to the script... @@ -44,7 +44,7 @@ and --src_type UGRID. http://www.earthsystemmodeling.org/ You may need more than one version to do everything above. On cheyenne -we use ESMF7.0.0. +we use ESMF7.1.0r. The version of NetCDF used with ESMF needs to be version 4.1 or higher and compiled with the NetCDF4 file format enabled (with HDF5 compression). diff --git a/tools/mkmapdata/mkmapdata.sh b/tools/mkmapdata/mkmapdata.sh index 49a4c03b89..436b504e07 100755 --- a/tools/mkmapdata/mkmapdata.sh +++ b/tools/mkmapdata/mkmapdata.sh @@ -342,7 +342,7 @@ case $hostname in if [ -z "$REGRID_PROC" ]; then REGRID_PROC=36 fi - esmfvers=7.0.0 + esmfvers=7.1.0r intelvers=17.0.1 module load esmf_libs/$esmfvers module load intel/$intelvers @@ -371,7 +371,7 @@ case $hostname in if [ -z "$REGRID_PROC" ]; then REGRID_PROC=8 fi - esmfvers=7.0.0 + esmfvers=7.1.0r intelvers=15.0.0 #intelvers=12.1.5 module purge From 11f7f6c307994718b586fbda521a41a9235c8ecc Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 29 Mar 2019 10:55:50 -0600 Subject: [PATCH 03/29] Change name of nldas grid Using 224x464_nldas for greater consistency with other grids: we typically either give the number of grid cells or the resolution in the name of the grid. I chose number of grid cells for consistency with our other regional grid (5x5_amazon). --- bld/namelist_files/checkmapfiles.ncl | 2 +- bld/namelist_files/namelist_defaults_ctsm_tools.xml | 2 +- bld/namelist_files/namelist_defaults_overall.xml | 2 +- bld/namelist_files/namelist_definition_ctsm.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/checkmapfiles.ncl b/bld/namelist_files/checkmapfiles.ncl index 6c3ef69537..af70bbd5b0 100644 --- a/bld/namelist_files/checkmapfiles.ncl +++ b/bld/namelist_files/checkmapfiles.ncl @@ -9,7 +9,7 @@ ; print( "Check that datm mapping files are consistent" ); - resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "nldas", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /); + resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "224x464_nldas", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /); space = " "; badres = 0 diff --git a/bld/namelist_files/namelist_defaults_ctsm_tools.xml b/bld/namelist_files/namelist_defaults_ctsm_tools.xml index b40d9f04bb..d148084df0 100644 --- a/bld/namelist_files/namelist_defaults_ctsm_tools.xml +++ b/bld/namelist_files/namelist_defaults_ctsm_tools.xml @@ -107,7 +107,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). landmesh -lnd/clm2/mappingdata/grids/SCRIPgrid_nldas_nomask_c190328.nc +lnd/clm2/mappingdata/grids/SCRIPgrid_224x464_nldas_nomask_c190328.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_brazil_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml index 3a20ba26aa..67ad28195e 100644 --- a/bld/namelist_files/namelist_defaults_overall.xml +++ b/bld/namelist_files/namelist_defaults_overall.xml @@ -75,7 +75,7 @@ determine default values for namelists. gx1v6 gx1v6 -nldas +nldas navy navy navy diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index cdbb6b4cfd..5b2d678f2d 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -1794,7 +1794,7 @@ CLM run type. +"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,224x464_nldas,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min"> Horizontal resolutions Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools From b4b8f495aa9f10363c5d10c4fcd9c0123e543144 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 29 Mar 2019 11:35:16 -0600 Subject: [PATCH 04/29] Add mapping files from raw data to nldas grid to xml --- bld/namelist_files/namelist_defaults_ctsm.xml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 06c11ca5a0..917fc94890 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -2274,6 +2274,46 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc + + + +lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_IGBP-GSDP_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_LandScan2004_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_AVHRR_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ORNL-Soil_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ISRIC-WISE_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_0.25x0.25_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_USGS_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_0.9x1.25_GRDC_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_360x720cru_cruncep_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_MODIS-wCsp_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner-mergeGIS_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_1km-merge-10min_HYDRO1K-merge-nomask_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner_to_224x464_nldas_nomask_aave_da_c190329.nc +lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_IGBPmergeICESatGIS_to_224x464_nldas_nomask_aave_da_c190329.nc + + + lnd/clm2/mappingdata/maps/5x5_amazon/map_0.5x0.5_MODIS_to_5x5_amazon_nomask_aave_da_c110920.nc Date: Mon, 1 Apr 2019 16:03:33 -0600 Subject: [PATCH 05/29] Note that pylint errors are expected with python2 Currently, with a python2 pylint on cheyenne pylint 1.9.4, astroid 1.6.5 Python 2.7.15 (default, Jan 11 2019, 15:22:07) I get these pylint errors: ************* Module ctsm.joblauncher.job_launcher_no_batch E: 49, 0: Bad option value 'subprocess-popen-preexec-fn' (bad-option-value) C: 63, 4: Method name "wait_for_last_process_to_complete" doesn't conform to snake_case naming style (invalid-name) --- python/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/README.md b/python/README.md index e562dc0f84..8b265d3290 100644 --- a/python/README.md +++ b/python/README.md @@ -20,4 +20,7 @@ support different options: ## pylint -You can run pylint on everything in the ctsm package with `make lint` +You can run pylint on everything in the ctsm package with `make lint`. + +Note: you should expect some errors if using a python2 version of +pylint, but this should be clean if running with a python3 version. From b145ac1b934b8bee947864d010201602fcba34ed Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 2 Apr 2019 13:25:52 -0600 Subject: [PATCH 06/29] Add rule to make nldas present-day surface dataset --- tools/mksurfdata_map/Makefile.data | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/mksurfdata_map/Makefile.data b/tools/mksurfdata_map/Makefile.data index abac6af279..994131fe01 100644 --- a/tools/mksurfdata_map/Makefile.data +++ b/tools/mksurfdata_map/Makefile.data @@ -66,6 +66,7 @@ STANDARD = \ global-present-f05 \ global-present-ne16np4 \ global-present-ne120np4 \ + global-present-nldas \ global-present-T42 \ global-historical \ global-historical-ne120np4 \ @@ -128,6 +129,9 @@ global-present-ne16np4 : FORCE global-present-ne120np4 : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res ne120np4 $(BACKGROUND) +global-present-nldas : FORCE + $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res 224x464_nldas $(BACKGROUND) + global-historical : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 1850 -res $(STANDARD_RES) $(BACKGROUND) From 0e93530c3b8a4bc922b04e38bb03cae5ff543fd1 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 2 Apr 2019 13:32:30 -0600 Subject: [PATCH 07/29] Fix to_hgrid xml attributes --- bld/namelist_files/namelist_defaults_ctsm.xml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 917fc94890..a0842deab9 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -2277,39 +2277,39 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_IGBP-GSDP_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_LandScan2004_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_AVHRR_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ORNL-Soil_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ISRIC-WISE_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.25x0.25_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_USGS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.9x1.25_GRDC_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_360x720cru_cruncep_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_MODIS-wCsp_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner-mergeGIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_1km-merge-10min_HYDRO1K-merge-nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_IGBPmergeICESatGIS_to_224x464_nldas_nomask_aave_da_c190329.nc From c360bf52a0380de0dd0e7d9f0abf8c8e9b3ddafa Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 2 Apr 2019 13:34:01 -0600 Subject: [PATCH 08/29] Fix to_lmask xml attributes --- bld/namelist_files/namelist_defaults_ctsm.xml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index a0842deab9..7a0a99ce86 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -2277,39 +2277,39 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_IGBP-GSDP_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_LandScan2004_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_AVHRR_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ORNL-Soil_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ISRIC-WISE_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.25x0.25_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_USGS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.9x1.25_GRDC_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_360x720cru_cruncep_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_MODIS-wCsp_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner-mergeGIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_1km-merge-10min_HYDRO1K-merge-nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_IGBPmergeICESatGIS_to_224x464_nldas_nomask_aave_da_c190329.nc From 60493cb30ee6b998e56284b85cd7713acd1b7993 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 2 Apr 2019 16:20:16 -0600 Subject: [PATCH 09/29] Add nldas surface dataset in namelist defaults --- bld/namelist_files/namelist_defaults_ctsm.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 7a0a99ce86..ab479f5ce3 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -621,6 +621,9 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc lnd/clm2/surfdata_map/surfdata_ne16np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc + +lnd/clm2/surfdata_map/ctsm1.0.dev031/surfdata_224x464_nldas_hist_16pfts_Irrig_CMIP6_simyr2000_c190402.nc + lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc From 2e9cb9b361a67034d2cc8bf66fe7bf34f8c34976 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 3 Apr 2019 12:11:31 -0600 Subject: [PATCH 10/29] Reorganize directory --- bld/namelist_files/namelist_defaults_ctsm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index ab479f5ce3..288215b205 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -622,7 +622,7 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc -lnd/clm2/surfdata_map/ctsm1.0.dev031/surfdata_224x464_nldas_hist_16pfts_Irrig_CMIP6_simyr2000_c190402.nc +lnd/clm2/surfdata_map/surfdata_224x464_nldas_hist_16pfts_Irrig_CMIP6_simyr2000_c190402.nc lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc From 572a598f885ca7e0b31ae2c68ad853530ba2255c Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 3 Apr 2019 12:11:50 -0600 Subject: [PATCH 11/29] Update tools README file gen_maps.sh is now gen_cesm_maps.sh, in a new location --- tools/README | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/README b/tools/README index cf0640958c..81024eb9d0 100644 --- a/tools/README +++ b/tools/README @@ -142,13 +142,14 @@ III. Process sequence to create input datasets needed to run CLM c.) New atmosphere or ocean resolution - If the region DOES include ocean, use $CIMEROOT/tools/mapping/gen_domain_files/gen_maps.sh to create a + If the region DOES include ocean, use + $CIMEROOT/tools/mapping/gen_mapping_files/gen_cesm_maps.sh to create a mapping file for it. Example: - cd $CIMEROOT/tools/mapping/gen_domain_files - ./gen_maps.sh -focn -fatm -nocn -natm + cd $CIMEROOT/tools/mapping/gen_mapping_files + ./gen_cesm_maps.sh -focn -fatm -nocn -natm 3.) Add SCRIP grid file(s) created in (1) into XML database in CLM (optional) From ad533c482c7b1e2b1765edc0d3282a49450924fa Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 3 Apr 2019 16:44:11 -0600 Subject: [PATCH 12/29] Add support for running NLDAS grid - Updates cime to point to a version with support for this grid - Adds PE layouts for this grid --- Externals.cfg | 4 +-- cime_config/config_pes.xml | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 723e6d98fd..704eebd346 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -29,8 +29,8 @@ required = True [cime] local_path = cime protocol = git -repo_url = https://github.com/ESMCI/cime -tag = ctsm/ctsm1.0/cime5.7.9/n01 +repo_url = https://github.com/billsacks/cime +hash = f73d65f536e983e0824522f3b5e68c45ea51b01c required = True [externals_description] diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 4362bed475..3132047134 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -671,6 +671,80 @@ + + + + none + + -4 + -4 + -4 + -4 + -4 + -4 + -4 + -4 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + none + + -1 + -50 + -50 + -50 + -50 + -50 + -50 + -50 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + -1 + -1 + -1 + -1 + -1 + -1 + -1 + + + + From 9992d470c1f374cdc8264cdc2e14f9464e7c562a Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 4 Apr 2019 06:12:20 -0600 Subject: [PATCH 13/29] Point to updated cime branch Uses a shorter alias for the nldas grid --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 704eebd346..a0a6170372 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -30,7 +30,7 @@ required = True local_path = cime protocol = git repo_url = https://github.com/billsacks/cime -hash = f73d65f536e983e0824522f3b5e68c45ea51b01c +hash = 6461a53c792c6fb68b2a9296478c770e5c02bdea required = True [externals_description] From f7d8a3e875f492673745347db11b0a648e3fb2c3 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Mon, 8 Apr 2019 15:15:06 -0600 Subject: [PATCH 14/29] Begin renaming NLDAS grid Using 0.125nldas2 rather than 224x464_nldas --- Externals.cfg | 2 +- bld/namelist_files/checkmapfiles.ncl | 2 +- bld/namelist_files/namelist_defaults_ctsm.xml | 2 +- bld/namelist_files/namelist_defaults_ctsm_tools.xml | 2 +- bld/namelist_files/namelist_defaults_overall.xml | 2 +- bld/namelist_files/namelist_definition_ctsm.xml | 2 +- cime_config/config_pes.xml | 4 ++-- tools/mksurfdata_map/Makefile.data | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index a0a6170372..de2ba26833 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -30,7 +30,7 @@ required = True local_path = cime protocol = git repo_url = https://github.com/billsacks/cime -hash = 6461a53c792c6fb68b2a9296478c770e5c02bdea +hash = ddfa9eb3dfda38fa438b019404a71fbb40988eca required = True [externals_description] diff --git a/bld/namelist_files/checkmapfiles.ncl b/bld/namelist_files/checkmapfiles.ncl index af70bbd5b0..c0751adcb0 100644 --- a/bld/namelist_files/checkmapfiles.ncl +++ b/bld/namelist_files/checkmapfiles.ncl @@ -9,7 +9,7 @@ ; print( "Check that datm mapping files are consistent" ); - resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "224x464_nldas", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /); + resolutions = (/ "128x256", "64x128", "48x96", "32x64", "8x16", "94x192", "0.23x0.31", "0.47x0.63", "0.9x1.25", "1.9x2.5", "2.5x3.33", "4x5", "10x15", "0.125nldas2", "5x5_amazon", "1x1_camdenNJ", "1x1_vancouverCAN", "1x1_mexicocityMEX", "1x1_asphaltjungleNJ", "1x1_brazil", "1x1_urbanc_alpha", "1x1_numaIA", "1x1_smallvilleIA", "ne4np4", "ne16np4", "ne30np4", "ne60np4", "ne120np4", "ne240np4" /); space = " "; badres = 0 diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 288215b205..4bdae77d1b 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -621,7 +621,7 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc lnd/clm2/surfdata_map/surfdata_ne16np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc - + lnd/clm2/surfdata_map/surfdata_224x464_nldas_hist_16pfts_Irrig_CMIP6_simyr2000_c190402.nc diff --git a/bld/namelist_files/namelist_defaults_ctsm_tools.xml b/bld/namelist_files/namelist_defaults_ctsm_tools.xml index d148084df0..f185de4d52 100644 --- a/bld/namelist_files/namelist_defaults_ctsm_tools.xml +++ b/bld/namelist_files/namelist_defaults_ctsm_tools.xml @@ -107,7 +107,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). landmesh -lnd/clm2/mappingdata/grids/SCRIPgrid_224x464_nldas_nomask_c190328.nc +lnd/clm2/mappingdata/grids/SCRIPgrid_0.125nldas2_nomask_c190328.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_brazil_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc diff --git a/bld/namelist_files/namelist_defaults_overall.xml b/bld/namelist_files/namelist_defaults_overall.xml index 67ad28195e..f7f2d041c2 100644 --- a/bld/namelist_files/namelist_defaults_overall.xml +++ b/bld/namelist_files/namelist_defaults_overall.xml @@ -75,7 +75,7 @@ determine default values for namelists. gx1v6 gx1v6 -nldas +nldas2 navy navy navy diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index 5b2d678f2d..82ab3cfac4 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -1794,7 +1794,7 @@ CLM run type. +"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min"> Horizontal resolutions Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 3132047134..0d0bbad5b7 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -671,7 +671,7 @@ - + none @@ -708,7 +708,7 @@ - + none diff --git a/tools/mksurfdata_map/Makefile.data b/tools/mksurfdata_map/Makefile.data index 994131fe01..bb712b3548 100644 --- a/tools/mksurfdata_map/Makefile.data +++ b/tools/mksurfdata_map/Makefile.data @@ -130,7 +130,7 @@ global-present-ne120np4 : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res ne120np4 $(BACKGROUND) global-present-nldas : FORCE - $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res 224x464_nldas $(BACKGROUND) + $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res 0.125nldas2 $(BACKGROUND) global-historical : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 1850 -res $(STANDARD_RES) $(BACKGROUND) From 1500fc558b939022d6ddbc69a8c2478362362df3 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 10 Apr 2019 11:27:51 -0600 Subject: [PATCH 15/29] New cime: new nldas2 domain files --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index de2ba26833..629054cff7 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -30,7 +30,7 @@ required = True local_path = cime protocol = git repo_url = https://github.com/billsacks/cime -hash = ddfa9eb3dfda38fa438b019404a71fbb40988eca +hash = 1e4cad60e3d6ae7eed0603ad56b9c4b5f12db34c required = True [externals_description] From e2913fdd6c1b2c285a514df7df3c2010fc14f97d Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 10 Apr 2019 11:38:20 -0600 Subject: [PATCH 16/29] Point to new mapping files for raw data -> nldas These use the new name for the nldas grid, but otherwise should be the same as before. --- bld/namelist_files/namelist_defaults_ctsm.xml | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 4bdae77d1b..8483ad56a5 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -2277,45 +2277,45 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc - + -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_IGBP-GSDP_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_LandScan2004_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_AVHRR_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ORNL-Soil_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_ISRIC-WISE_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.25x0.25_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_5x5min_nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_USGS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.9x1.25_GRDC_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_0.5x0.5_MODIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_360x720cru_cruncep_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_MODIS-wCsp_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner-mergeGIS_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_1km-merge-10min_HYDRO1K-merge-nomask_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_3x3min_GLOBE-Gardner_to_224x464_nldas_nomask_aave_da_c190329.nc -lnd/clm2/mappingdata/maps/224x464_nldas/map_10x10min_IGBPmergeICESatGIS_to_224x464_nldas_nomask_aave_da_c190329.nc - - +lnd/clm2/mappingdata/maps/0.125nldas2/map_1km-merge-10min_HYDRO1K-merge-nomask_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_nomask_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_0.25x0.25_MODIS_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_0.9x1.25_GRDC_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_10x10min_nomask_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_360x720cru_cruncep_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_LandScan2004_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_10x10min_IGBPmergeICESatGIS_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_MODIS-wCsp_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_0.5x0.5_MODIS_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_GLOBE-Gardner-mergeGIS_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_ISRIC-WISE_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_GLOBE-Gardner_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_0.5x0.5_AVHRR_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_USGS_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_IGBP-GSDP_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_5x5min_ORNL-Soil_to_0.125nldas2_nomask_aave_da_c190408.nc + + lnd/clm2/mappingdata/maps/5x5_amazon/map_0.5x0.5_MODIS_to_5x5_amazon_nomask_aave_da_c110920.nc From da7405cd3a66ea8782eef71c4e82a44bcd03f8c6 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 10 Apr 2019 11:53:46 -0600 Subject: [PATCH 17/29] Use -hirespft for nldas2 surface dataset --- tools/mksurfdata_map/Makefile.data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mksurfdata_map/Makefile.data b/tools/mksurfdata_map/Makefile.data index bb712b3548..653fdd3d91 100644 --- a/tools/mksurfdata_map/Makefile.data +++ b/tools/mksurfdata_map/Makefile.data @@ -130,7 +130,7 @@ global-present-ne120np4 : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res ne120np4 $(BACKGROUND) global-present-nldas : FORCE - $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res 0.125nldas2 $(BACKGROUND) + $(MKSURFDATA) -no-crop -hirespft -glc_nec 10 -y 2000 -res 0.125nldas2 $(BACKGROUND) global-historical : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 1850 -res $(STANDARD_RES) $(BACKGROUND) From 33b91b0004b5378c83e5f307a45f54d4e6b40fc8 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 10 Apr 2019 16:33:24 -0600 Subject: [PATCH 18/29] Use year-2005 rather than year-2000 for nldas surface dataset It appears that hirespft will require year 2005. Also add a note that this won't work until the hirespft bug is fixed. --- tools/mksurfdata_map/Makefile.data | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/mksurfdata_map/Makefile.data b/tools/mksurfdata_map/Makefile.data index 653fdd3d91..b5154ae573 100644 --- a/tools/mksurfdata_map/Makefile.data +++ b/tools/mksurfdata_map/Makefile.data @@ -129,8 +129,9 @@ global-present-ne16np4 : FORCE global-present-ne120np4 : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res ne120np4 $(BACKGROUND) +# BUG(wjs, 2019-04-10, ESCOMP/ctsm#262) This -hirespft won't work until issue 262 is resolved global-present-nldas : FORCE - $(MKSURFDATA) -no-crop -hirespft -glc_nec 10 -y 2000 -res 0.125nldas2 $(BACKGROUND) + $(MKSURFDATA) -no-crop -hirespft -glc_nec 10 -y 2005 -res 0.125nldas2 $(BACKGROUND) global-historical : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 1850 -res $(STANDARD_RES) $(BACKGROUND) From c04a26a8f3039d3b7f9069b65c3530d25e0ce9a4 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 12 Apr 2019 13:48:45 -0600 Subject: [PATCH 19/29] Add raw data mapping file for 3x3min_MODIS This is needed for hirespft --- bld/namelist_files/namelist_defaults_ctsm.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 8483ad56a5..4b0ac97751 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -2296,6 +2296,8 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nclnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_LandScan2004_to_0.125nldas2_nomask_aave_da_c190408.nc lnd/clm2/mappingdata/maps/0.125nldas2/map_10x10min_IGBPmergeICESatGIS_to_0.125nldas2_nomask_aave_da_c190408.nc +lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_MODIS_to_0.125nldas2_nomask_aave_da_c190412.nc lnd/clm2/mappingdata/maps/0.125nldas2/map_3x3min_MODIS-wCsp_to_0.125nldas2_nomask_aave_da_c190408.nc Date: Fri, 12 Apr 2019 14:58:14 -0600 Subject: [PATCH 20/29] Point to surface dataset with updated grid name (contents same as before) --- bld/namelist_files/namelist_defaults_ctsm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 4b0ac97751..536ff0ce0f 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -622,7 +622,7 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc -lnd/clm2/surfdata_map/surfdata_224x464_nldas_hist_16pfts_Irrig_CMIP6_simyr2000_c190402.nc +lnd/clm2/surfdata_map/surfdata_0.125nldas2_hist_16pfts_Irrig_CMIP6_simyr2000_c190412.nc lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc From 44915e43fabcebfd7780db79edacea6fa443517e Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 12 Apr 2019 15:02:25 -0600 Subject: [PATCH 21/29] Change mask name valid value from nldas to nldas2 --- bld/namelist_files/namelist_definition_ctsm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index 82ab3cfac4..04d06b1ff5 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -1816,7 +1816,7 @@ hist means do NOT use a future scenario, just use historical data. + valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx1v1,T62,cruncep,nldas2"> Land mask description From 170be8bb9b3f552c854b93cdb2996de0e267f33d Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 12 Apr 2019 15:06:37 -0600 Subject: [PATCH 22/29] Use year-2005 rather than year-2000 surface dataset When we switch to hirespft, we'll be using year-2005. So it seems best to start out consistent with that. --- bld/namelist_files/namelist_defaults_ctsm.xml | 2 +- tools/mksurfdata_map/Makefile.data | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 536ff0ce0f..597c71d76f 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -622,7 +622,7 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc -lnd/clm2/surfdata_map/surfdata_0.125nldas2_hist_16pfts_Irrig_CMIP6_simyr2000_c190412.nc +lnd/clm2/surfdata_map/surfdata_0.125nldas2_hist_16pfts_Irrig_CMIP6_simyr2005_c190412.nc lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc diff --git a/tools/mksurfdata_map/Makefile.data b/tools/mksurfdata_map/Makefile.data index b5154ae573..ddd915735d 100644 --- a/tools/mksurfdata_map/Makefile.data +++ b/tools/mksurfdata_map/Makefile.data @@ -130,6 +130,8 @@ global-present-ne120np4 : FORCE $(MKSURFDATA) -no-crop -glc_nec 10 -y 2000 -res ne120np4 $(BACKGROUND) # BUG(wjs, 2019-04-10, ESCOMP/ctsm#262) This -hirespft won't work until issue 262 is resolved +# For now, I'm using: +# -no-crop -glc_nec 10 -y 2005 -res 0.125nldas2 global-present-nldas : FORCE $(MKSURFDATA) -no-crop -hirespft -glc_nec 10 -y 2005 -res 0.125nldas2 $(BACKGROUND) From 58e0e3a7b312b172acb6eafd90e508a431d3f20d Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 12 Apr 2019 15:09:37 -0600 Subject: [PATCH 23/29] Make alignment consistent --- bld/namelist_files/namelist_defaults_ctsm_tools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm_tools.xml b/bld/namelist_files/namelist_defaults_ctsm_tools.xml index f185de4d52..9fa7b11d33 100644 --- a/bld/namelist_files/namelist_defaults_ctsm_tools.xml +++ b/bld/namelist_files/namelist_defaults_ctsm_tools.xml @@ -107,7 +107,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). landmesh -lnd/clm2/mappingdata/grids/SCRIPgrid_0.125nldas2_nomask_c190328.nc +lnd/clm2/mappingdata/grids/SCRIPgrid_0.125nldas2_nomask_c190328.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_brazil_nomask_c110308.nc lnd/clm2/mappingdata/grids/SCRIPgrid_1x1pt_camdenNJ_nomask_c110308.nc From 6010c4e55c256a0dda06f738e8f1f48bfb3f6def Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 12 Apr 2019 15:55:57 -0600 Subject: [PATCH 24/29] Point to mosart version with support for nldas grid --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 629054cff7..1c25514bb6 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -22,8 +22,8 @@ required = True [mosart] local_path = components/mosart protocol = git -repo_url = https://github.com/ESCOMP/mosart -tag = release-cesm2.0.00 +repo_url = https://github.com/billsacks/mosart +hash = cdb8ab54ac8e26bcb318b697f057d38027d60ffa required = True [cime] From a38724f46de1473695b9dcfc329be01c94f44c14 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Mon, 15 Apr 2019 11:18:51 -0600 Subject: [PATCH 25/29] Point to updated mosart with update for nldas grid --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 1c25514bb6..669fe74e4c 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -23,7 +23,7 @@ required = True local_path = components/mosart protocol = git repo_url = https://github.com/billsacks/mosart -hash = cdb8ab54ac8e26bcb318b697f057d38027d60ffa +hash = 4b86d63e76d5994dab2b43a42c0f5f1a62bfb1ab required = True [cime] From a1914d8687e99e70f76e53a37502c09aec266f47 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Mon, 15 Apr 2019 11:49:07 -0600 Subject: [PATCH 26/29] Point to updated cime, with rof nldas grid --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 669fe74e4c..79821eb8c5 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -30,7 +30,7 @@ required = True local_path = cime protocol = git repo_url = https://github.com/billsacks/cime -hash = 1e4cad60e3d6ae7eed0603ad56b9c4b5f12db34c +hash = aaed75270080e831d2827ef85e70fa279c1d76e3 required = True [externals_description] From f2e7c2b72888a325ccf25fa017bb9605e495d448 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 16 Apr 2019 14:12:59 -0600 Subject: [PATCH 27/29] Point to external tags rather than hashes These tags are the same as the hashes we were pointing to before. For mosart: note that mosart1_0_31 is identical to release-cesm2.0.00 (we were originally pointing to that release tag on CTSM master). --- Externals.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 79821eb8c5..c6a592b71a 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -22,15 +22,15 @@ required = True [mosart] local_path = components/mosart protocol = git -repo_url = https://github.com/billsacks/mosart -hash = 4b86d63e76d5994dab2b43a42c0f5f1a62bfb1ab +repo_url = https://github.com/ESCOMP/mosart +tag = nldas-grid.n01_mosart1_0_31 required = True [cime] local_path = cime protocol = git -repo_url = https://github.com/billsacks/cime -hash = aaed75270080e831d2827ef85e70fa279c1d76e3 +repo_url = https://github.com/ESMCI/cime +tag = ctsm/ctsm1.0/cime5.7.9/n02 required = True [externals_description] From 27d3185f05087bbe584243d1c51ba6d012b4d542 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 30 Apr 2019 10:01:56 -0600 Subject: [PATCH 28/29] Update cime version This brings in the following already-tagged cime commits: * 3a316af94 (tag: ctsm/ctsm1.0/cime5.7.9/n04) - (5 days ago) Generalize DATM_CLMNCEP_YR_ALIGN for present-day compsets - Bill Sacks * 54bb3b59d - (5 days ago) Change DATM_CLMNCEP_YR_ALIGN for present-day compsets - Bill Sacks * f9ac23663 (tag: ctsm/ctsm1.0/cime5.7.9/n03) - (12 days ago) Allow specific tests to ignore field list differences - Bill Sacks In addition, this adds support for nldas datm forcing data. --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index c6a592b71a..b5eb92363b 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -29,8 +29,8 @@ required = True [cime] local_path = cime protocol = git -repo_url = https://github.com/ESMCI/cime -tag = ctsm/ctsm1.0/cime5.7.9/n02 +repo_url = https://github.com/billsacks/cime +hash = 9c6e80afacfe45e602aa63a0fccb019bb5e34ca1 required = True [externals_description] From bb15795a1f94552815dc0b081ab1926866ffa2ae Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 30 Apr 2019 12:04:11 -0600 Subject: [PATCH 29/29] Point to cime tag instead of hash --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index b5eb92363b..ae541c324f 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -29,8 +29,8 @@ required = True [cime] local_path = cime protocol = git -repo_url = https://github.com/billsacks/cime -hash = 9c6e80afacfe45e602aa63a0fccb019bb5e34ca1 +repo_url = https://github.com/ESMCI/cime +tag = ctsm/ctsm1.0/cime5.7.9/n05 required = True [externals_description]