From f9e63a3535366314306f70972e18ec260fd50bff Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 5 May 2023 15:47:54 +0000 Subject: [PATCH 01/17] Add logic to ignore soil and clay percentage records. Part of #821. --- sorc/sfc_climo_gen.fd/search.f90 | 2 +- sorc/sfc_climo_gen.fd/source_grid.F90 | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sorc/sfc_climo_gen.fd/search.f90 b/sorc/sfc_climo_gen.fd/search.f90 index d5b44ebe6..0de2b5817 100644 --- a/sorc/sfc_climo_gen.fd/search.f90 +++ b/sorc/sfc_climo_gen.fd/search.f90 @@ -76,7 +76,7 @@ subroutine search (field, mask, idim, jdim, tile, field_name) case ('vegetation_type') ! vegetation type default_value = float(3) case default - print*,'- FATAL ERROR IN ROUTINE SEARCH. UNIDENTIFIED FIELD : ', field + print*,'- FATAL ERROR IN ROUTINE SEARCH. UNIDENTIFIED FIELD : ', field_name call mpi_abort(mpi_comm_world, 77, ierr) end select diff --git a/sorc/sfc_climo_gen.fd/source_grid.F90 b/sorc/sfc_climo_gen.fd/source_grid.F90 index d9abacd34..31f0b00e0 100644 --- a/sorc/sfc_climo_gen.fd/source_grid.F90 +++ b/sorc/sfc_climo_gen.fd/source_grid.F90 @@ -59,6 +59,7 @@ subroutine define_source_grid(localpet, npets, input_file) integer, intent(in) :: localpet, npets + character(len=50) :: field_names_save(100) character(len=50) :: vname integer :: dimid, dims(1), ncid, status @@ -160,10 +161,9 @@ subroutine define_source_grid(localpet, npets, input_file) ! number of variables minus 5. !----------------------------------------------------------------------- - num_fields = num_vars - 5 - num_records = num_vars * num_time_recs - - allocate(field_names(num_fields)) +! NOTE: the new BNU soil type data contains extra records for +! sand and clay percentages. These extra records are not need yet, +! so add logic to temporarily ignore them. count = 0 do n = 1, num_vars @@ -176,12 +176,23 @@ subroutine define_source_grid(localpet, npets, input_file) if (trim(vname) == 'lon_corner') cycle if (trim(vname) == 'lat') cycle if (trim(vname) == 'lat_corner') cycle + if (trim(vname) == 'clay_lev1') cycle + if (trim(vname) == 'clay_top') cycle + if (trim(vname) == 'sand_lev1') cycle + if (trim(vname) == 'sand_top') cycle count = count + 1 - field_names(count) = vname + field_names_save(count) = vname enddo + num_fields = count + num_records = num_vars * num_time_recs + + allocate(field_names(num_fields)) + + field_names = field_names_save(1:num_fields) + if(localpet==0) print*,'- FIELDS TO BE PROCESSED: ', field_names if (localpet == 0) then From ecf2442757d79eccdaee31ba0993e9506646ad0f Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 1 Jun 2023 15:07:28 +0000 Subject: [PATCH 02/17] Update documentation and script logs for new files. Part of #821. --- docs/source/ufs_utils.rst | 9 ++------- driver_scripts/driver_grid.hera.sh | 9 ++------- driver_scripts/driver_grid.jet.sh | 9 ++------- driver_scripts/driver_grid.orion.sh | 9 ++------- driver_scripts/driver_grid.wcoss2.sh | 9 ++------- util/sfc_climo_gen/sfc_gen.sh | 9 ++------- 6 files changed, 12 insertions(+), 42 deletions(-) diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst index ef50d2838..5bb1b0d0e 100644 --- a/docs/source/ufs_utils.rst +++ b/docs/source/ufs_utils.rst @@ -539,19 +539,14 @@ The surface climatological data is located here `./fix/fix_sfc_climo Date: Mon, 14 Aug 2023 20:32:59 +0000 Subject: [PATCH 03/17] Some script updates. Fixes #821. --- driver_scripts/driver_grid.hera.sh | 6 +++--- util/sfc_climo_gen/sfc_gen.sh | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/driver_scripts/driver_grid.hera.sh b/driver_scripts/driver_grid.hera.sh index baa88a2a1..e1fd149d3 100755 --- a/driver_scripts/driver_grid.hera.sh +++ b/driver_scripts/driver_grid.hera.sh @@ -6,7 +6,7 @@ #SBATCH -o log.fv3_grid_driver #SBATCH -e log.fv3_grid_driver #SBATCH --nodes=1 --ntasks-per-node=24 -##SBATCH --partition=bigmem +#SBATCH --partition=bigmem #SBATCH -q debug #SBATCH -t 00:20:00 @@ -86,7 +86,7 @@ export vegsoilt_frac='.false.' # When .false., output dominant soil and # the dominant category. A Fortran logical, # so include the dots. -export veg_type_src="modis.igbp.0.05" # Vegetation type data. +export veg_type_src="viirs.v2.igbp.30s" # Vegetation type data. # For viirs-based vegetation type data, set to: # 1) "viirs.v2.igbp.30s" for global 30s data # For the modis-based data, set to: @@ -96,7 +96,7 @@ export veg_type_src="modis.igbp.0.05" # Vegetation type data. # 4) "modis.igbp.nh.30s" for N Hemis 30s data # 5) "modis.igbp.30s" for global 30s data -export soil_type_src="statsgo.0.05" # Soil type data. +export soil_type_src="bnu.v2.30s" # Soil type data. # For STATSGO data # 1) "statsgo.0.05" for global 0.05-deg data # 2) "statsgo.0.03" for global 0.03-deg data diff --git a/util/sfc_climo_gen/sfc_gen.sh b/util/sfc_climo_gen/sfc_gen.sh index d6a21e835..62d8a516a 100755 --- a/util/sfc_climo_gen/sfc_gen.sh +++ b/util/sfc_climo_gen/sfc_gen.sh @@ -66,22 +66,25 @@ set -x #export res=96 -export res=96.mx100 +export res=768.mx025 #HALO=4 #export GRIDTYPE=regional #FIX_REG=/lfs/h2/emc/stmp/$LOGNAME/fix.reg -export veg_type_src="modis.igbp.0.05" +export veg_type_src="viirs.v2.igbp.30s" -export soil_type_src="statsgo.0.05" +export soil_type_src="bnu.v2.30s" -export WORK_DIR=/lfs/h2/emc/stmp/$LOGNAME/work.sfc -export SAVE_DIR=/lfs/h2/emc/stmp/$LOGNAME/sfc.C${res} +export WORK_DIR=/scratch1/NCEPDEV/stmp2/$LOGNAME/work.sfc +export SAVE_DIR=/scratch1/NCEPDEV/stmp2/$LOGNAME/sfc.C${res} export FIX_FV3=${BASE_DIR}/fix/orog/C${res} -export vegsoilt_frac=.true. +# Requires much more resources when true. On hera, uses 6 nodes, +# 12 tasks per node. On WCOSS2... + +export vegsoilt_frac=.false. #------------------------------------------------------------------------ #------------------------------------------------------------------------ From 98caf8b2bd39e5f5a34565128e9c88a0d60e5297 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 15 Aug 2023 09:03:47 -0500 Subject: [PATCH 04/17] Update orion driver script to use additional resources as required by the new 30s data. Fixes #821. --- driver_scripts/driver_grid.orion.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/driver_scripts/driver_grid.orion.sh b/driver_scripts/driver_grid.orion.sh index e2c893f73..10729da08 100755 --- a/driver_scripts/driver_grid.orion.sh +++ b/driver_scripts/driver_grid.orion.sh @@ -5,7 +5,7 @@ #SBATCH --open-mode=truncate #SBATCH -o log.fv3_grid_driver #SBATCH -e log.fv3_grid_driver -#SBATCH --nodes=1 --ntasks-per-node=24 +#SBATCH --nodes=2 --ntasks-per-node=15 #SBATCH -q debug #SBATCH -t 00:30:00 @@ -71,7 +71,7 @@ module list # Set grid specs here. #----------------------------------------------------------------------- -export gtype=regional_esg # 'uniform', 'stretch', 'nest', +export gtype=uniform # 'uniform', 'stretch', 'nest', # 'regional_gfdl', 'regional_esg' export make_gsl_orog=false # When 'true' will output 'oro' files for @@ -83,7 +83,7 @@ export vegsoilt_frac='.false.' # When true, outputs percent of each # outputs the dominant category. A # Fortran logical, so include the dots. -export veg_type_src="modis.igbp.0.05" # Vegetation type data. +export veg_type_src="viirs.v2.igbp.30s" # Vegetation type data. # For viirs-based vegetation type data, set to: # 1) "viirs.v2.igbp.30s" for global 30s data # For the modis-based data, set to: @@ -93,15 +93,15 @@ export veg_type_src="modis.igbp.0.05" # Vegetation type data. # 4) "modis.igbp.nh.30s" for N Hemis 30s data # 5) "modis.igbp.30s" for global 30s data -export soil_type_src="statsgo.0.05" # Soil type data. +export soil_type_src="bnu.v2.30s" # Soil type data. + # For Beijing Normal Univ. data, set to: + # 1) "bnu.v2.30s" for global 30s data. # For STATSGO soil type data, set to: # 1) "statsgo.0.05" for global 0.05-deg data # 2) "statsgo.0.03" for global 0.03-deg data # 3) "statsgo.conus.30s" for CONUS 30s data # 4) "statsgo.nh.30s" for NH 30s data # 5) "statsgo.30s" for global 30s data - # For Beijing Normal Univ. data, set to: - # 1) "bnu.v2.30s" for global 30s data. if [ $gtype = uniform ]; then export res=96 From 6179b240451cd487cf3af36a7a7f23c133f35660 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 15 Aug 2023 14:42:55 +0000 Subject: [PATCH 05/17] Update jet grid driver script to request more resources as required by the new 30s data. Fixes #821. --- driver_scripts/driver_grid.jet.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/driver_scripts/driver_grid.jet.sh b/driver_scripts/driver_grid.jet.sh index 26990752e..44ddb8ac7 100755 --- a/driver_scripts/driver_grid.jet.sh +++ b/driver_scripts/driver_grid.jet.sh @@ -5,10 +5,10 @@ #SBATCH --open-mode=truncate #SBATCH -o log.fv3_grid_driver #SBATCH -e log.fv3_grid_driver -#SBATCH --nodes=1 --ntasks-per-node=24 +#SBATCH --nodes=3 --ntasks-per-node=10 #SBATCH --partition=xjet -#SBATCH -q batch -#SBATCH -t 00:10:00 +#SBATCH -q debug +#SBATCH -t 00:30:00 #----------------------------------------------------------------------- # Driver script to create a cubic-sphere based model grid on Jet. @@ -84,7 +84,7 @@ export vegsoilt_frac='.false.' # When true, outputs percent of each # outputs the dominant category. A # Fortran logical, so include the dots. -export veg_type_src="modis.igbp.0.05" # Vegetation type data. +export veg_type_src="viirs.v2.igbp.30s" # Vegetation type data. # For viirs-based vegetation type data, set to: # 1) "viirs.v2.igbp.30s" for global 30s data # For the modis-based data, set to: @@ -94,15 +94,15 @@ export veg_type_src="modis.igbp.0.05" # Vegetation type data. # 4) "modis.igbp.nh.30s" for N Hemis 30s data # 5) "modis.igbp.30s" for global 30s data -export soil_type_src="statsgo.0.05" # Soil type data. +export soil_type_src="bnu.v2.30s" # Soil type data. + # For Beijing Normal Univ. data, set to: + # 1) "bnu.v2.30s" for global 30s data. # For STATSGO soil type data, set to: # 1) "statsgo.0.05" for global 0.05-deg data # 2) "statsgo.0.03" for global 0.03-deg data # 3) "statsgo.conus.30s" for CONUS 30s data # 4) "statsgo.nh.30s" for NH 30s data # 5) "statsgo.30s" for global 30s data - # For Beijing Normal Univ. data, set to: - # 1) "bnu.v2.30s" for global 30s data. if [ $gtype = uniform ]; then export res=96 From fc1759322117a13cf0f130c4b141080eee57114b Mon Sep 17 00:00:00 2001 From: "George.Gayno" Date: Tue, 15 Aug 2023 15:31:49 +0000 Subject: [PATCH 06/17] Minor updates to the wcoss2 driver grid script. Fixes #821. --- driver_scripts/driver_grid.wcoss2.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/driver_scripts/driver_grid.wcoss2.sh b/driver_scripts/driver_grid.wcoss2.sh index 15f4caec2..2acf52652 100755 --- a/driver_scripts/driver_grid.wcoss2.sh +++ b/driver_scripts/driver_grid.wcoss2.sh @@ -4,7 +4,7 @@ #PBS -e log #PBS -q debug #PBS -A GFS-DEV -#PBS -l walltime=00:15:00 +#PBS -l walltime=00:30:00 #PBS -N make_grid #PBS -l select=1:ncpus=24:mem=500GB @@ -70,7 +70,7 @@ module list # Set grid specs here. #----------------------------------------------------------------------- -export gtype=regional_esg # 'uniform', 'stretch', 'nest', +export gtype=uniform # 'uniform', 'stretch', 'nest', # 'regional_gfdl', 'regional_esg' export make_gsl_orog=false # When 'true' will output 'oro' files for @@ -82,7 +82,7 @@ export vegsoilt_frac='.false.' # When true, outputs percent of each # outputs the dominant category. A # Fortran logical, so include the dots. -export veg_type_src="modis.igbp.0.05" # Vegetation type data. +export veg_type_src="viirs.v2.igbp.30s" # Vegetation type data. # For viirs-based vegetation type data, set to: # 1) "viirs.v2.igbp.30s" for global 30s data # For the modis-based data, set to: @@ -92,15 +92,15 @@ export veg_type_src="modis.igbp.0.05" # Vegetation type data. # 4) "modis.igbp.nh.30s" for N Hemis 30s data # 5) "modis.igbp.30s" for global 30s data -export soil_type_src="statsgo.0.05" # Soil type data +export soil_type_src="bnu.v2.30s" # Soil type data + # For Beijing Normal Univ. data, set to: + # 1) "bnu.v2.30s" for global 30s data. # For STATSGO soil type data, set to: # 1) "statsgo.0.05" for global 0.05-deg data # 2) "statsgo.0.03" for global 0.03-deg data # 3) "statsgo.conus.30s" for CONUS 30s data # 4) "statsgo.nh.30s" for NH 30s data # 5) "statsgo.30s" for global 30s data - # For Beijing Normal Univ. data, set to: - # 1) "bnu.v2.30s" for global 30s data. if [ $gtype = uniform ]; then export res=96 From 6f3fe9e5e86a1e3e6ac360482b44a91356652af5 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 16 Aug 2023 17:48:06 +0000 Subject: [PATCH 07/17] Update some script comments. Update sfc_climo_gen script to use the 0.5-degree version of the soil substrate temperature which will allow the use of more MPI tasks. Fixes #821. --- ush/sfc_climo_gen.sh | 2 +- util/sfc_climo_gen/sfc_gen.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ush/sfc_climo_gen.sh b/ush/sfc_climo_gen.sh index 020ec0d13..63bedb3e5 100755 --- a/ush/sfc_climo_gen.sh +++ b/ush/sfc_climo_gen.sh @@ -70,7 +70,7 @@ fi cat << EOF > ./fort.41 &config input_facsf_file="${input_sfc_climo_dir}/facsf.1.0.nc" -input_substrate_temperature_file="${input_sfc_climo_dir}/substrate_temperature.2.6x1.5.nc" +input_substrate_temperature_file="${input_sfc_climo_dir}/substrate_temperature.gfs.0.5.nc" input_maximum_snow_albedo_file="${input_sfc_climo_dir}/maximum_snow_albedo.0.05.nc" input_snowfree_albedo_file="${input_sfc_climo_dir}/snowfree_albedo.4comp.0.05.nc" input_slope_type_file="${input_sfc_climo_dir}/slope_type.1.0.nc" diff --git a/util/sfc_climo_gen/sfc_gen.sh b/util/sfc_climo_gen/sfc_gen.sh index 62d8a516a..cbaf27a81 100755 --- a/util/sfc_climo_gen/sfc_gen.sh +++ b/util/sfc_climo_gen/sfc_gen.sh @@ -48,14 +48,14 @@ # - "modis.igbp.30s" for global 30s data # # soil_type_src - Input soil type data. Choices are: +# For Beijing Norm. Univ. soil type data +# - "bnu.v2.30s" for global 30s data # For STATSGO soil type data # - "statsgo.0.05" for global 0.05-deg data # - "statsgo.0.03" for global 0.03-deg data # - "statsgo.conus.30s" for CONUS 30s data # - "statsgo.nh.30s" for NH 30s data # - "statsgo.30s" for global 30s data -# For Beijing Norm. Univ. soil type data -# - "bnu.v2.30s" for global 30s data # # vegsoilt_frac - When .true., output the fraction of each # vegetation and soil type and the dominant From 64fdfd79782ff233d87591f9fdb81e489833dc88 Mon Sep 17 00:00:00 2001 From: "George.Gayno" Date: Wed, 16 Aug 2023 19:33:41 +0000 Subject: [PATCH 08/17] Update comments in the sfc_climo_gen utility script. Fixes #821. --- util/sfc_climo_gen/sfc_gen.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/util/sfc_climo_gen/sfc_gen.sh b/util/sfc_climo_gen/sfc_gen.sh index cbaf27a81..9988c9096 100755 --- a/util/sfc_climo_gen/sfc_gen.sh +++ b/util/sfc_climo_gen/sfc_gen.sh @@ -65,7 +65,6 @@ set -x -#export res=96 export res=768.mx025 #HALO=4 @@ -81,8 +80,8 @@ export SAVE_DIR=/scratch1/NCEPDEV/stmp2/$LOGNAME/sfc.C${res} export FIX_FV3=${BASE_DIR}/fix/orog/C${res} -# Requires much more resources when true. On hera, uses 6 nodes, -# 12 tasks per node. On WCOSS2... +# Requires much more resources when true. On hera, use 6 nodes, +# 12 tasks per node. On WCOSS2, use 5 nodes, 12 tasks per node. export vegsoilt_frac=.false. From d1e4f51fced46d6601a471920fb68ad8f3f28ac4 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 18 Aug 2023 17:56:12 +0000 Subject: [PATCH 09/17] Update "c96.viirs.vegt" regression test to use the new viirs data. Fixes #821. --- reg_tests/grid_gen/c96.viirs.vegt.sh | 2 +- reg_tests/grid_gen/driver.hera.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reg_tests/grid_gen/c96.viirs.vegt.sh b/reg_tests/grid_gen/c96.viirs.vegt.sh index d0db44538..7ebba8b35 100755 --- a/reg_tests/grid_gen/c96.viirs.vegt.sh +++ b/reg_tests/grid_gen/c96.viirs.vegt.sh @@ -14,7 +14,7 @@ export out_dir=${WORK_DIR}/c96.viirs.vegt export res=96 export gtype=uniform -export veg_type_src="viirs.igbp.0.05" +export veg_type_src="viirs.v2.igbp.30s" NCCMP=${NCCMP:-$(which nccmp)} diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh index ef3b37b1c..97fa020d0 100755 --- a/reg_tests/grid_gen/driver.hera.sh +++ b/reg_tests/grid_gen/driver.hera.sh @@ -74,8 +74,8 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_ #----------------------------------------------------------------------------- LOG_FILE2=${LOG_FILE}02 -TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \ - -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh) +TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \ + --partition=bigmem -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh) #----------------------------------------------------------------------------- # gfdl regional grid From 54b88b6a451822176e08c773afc3e6629d8abcd5 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 18 Aug 2023 18:11:13 +0000 Subject: [PATCH 10/17] Update "c96.viirs.vegt" test to use new BNU soil data. Fixes #821. --- reg_tests/grid_gen/c96.viirs.vegt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/reg_tests/grid_gen/c96.viirs.vegt.sh b/reg_tests/grid_gen/c96.viirs.vegt.sh index 7ebba8b35..92e2df13e 100755 --- a/reg_tests/grid_gen/c96.viirs.vegt.sh +++ b/reg_tests/grid_gen/c96.viirs.vegt.sh @@ -15,6 +15,7 @@ export out_dir=${WORK_DIR}/c96.viirs.vegt export res=96 export gtype=uniform export veg_type_src="viirs.v2.igbp.30s" +export soil_type_src="bnu.v2.30s" NCCMP=${NCCMP:-$(which nccmp)} From cf4cda94649292acad98042c5bbd3267d17b663e Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 18 Aug 2023 18:38:46 +0000 Subject: [PATCH 11/17] Rename "c96.viirs.vegt" test to "c96.viirs.bnu". Fixes #821. --- .../{c96.viirs.vegt.sh => c96.viirs.bnu.sh} | 20 +++++++++---------- reg_tests/grid_gen/driver.hera.sh | 6 +++--- reg_tests/grid_gen/driver.jet.sh | 6 +++--- reg_tests/grid_gen/driver.orion.sh | 6 +++--- reg_tests/grid_gen/driver.wcoss2.sh | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) rename reg_tests/grid_gen/{c96.viirs.vegt.sh => c96.viirs.bnu.sh} (73%) diff --git a/reg_tests/grid_gen/c96.viirs.vegt.sh b/reg_tests/grid_gen/c96.viirs.bnu.sh similarity index 73% rename from reg_tests/grid_gen/c96.viirs.vegt.sh rename to reg_tests/grid_gen/c96.viirs.bnu.sh index 92e2df13e..3e24e3509 100755 --- a/reg_tests/grid_gen/c96.viirs.vegt.sh +++ b/reg_tests/grid_gen/c96.viirs.bnu.sh @@ -2,15 +2,15 @@ #----------------------------------------------------------------------- # Create a C96 global uniform grid using VIIRS-based vegetation type -# data. Compare output to a set of baseline files using the -# 'nccmp' utility. This script is run by the machine specific -# driver script. +# data and BNU soil type data. Compare output to a set of baseline +# files using the 'nccmp' utility. This script is run by the machine +# specific driver script. #----------------------------------------------------------------------- set -x -export TEMP_DIR=${WORK_DIR}/c96.viirs.vegt.work -export out_dir=${WORK_DIR}/c96.viirs.vegt +export TEMP_DIR=${WORK_DIR}/c96.viirs.bnu.work +export out_dir=${WORK_DIR}/c96.viirs.bnu export res=96 export gtype=uniform @@ -30,7 +30,7 @@ $home_dir/ush/fv3gfs_driver_grid.sh iret=$? if [ $iret -ne 0 ]; then set +x - echo "<<< C96 VIIRS VEGT FAILED. <<<" + echo "<<< C96 VIIRS BNU FAILED. <<<" exit $iret fi @@ -47,7 +47,7 @@ for files in *tile*.nc ./fix_sfc/*tile*.nc do if [ -f $files ]; then echo CHECK $files - $NCCMP -dmfqS $files $HOMEreg/c96.viirs.vegt/$files + $NCCMP -dmfqS $files $HOMEreg/c96.viirs.bnu/$files iret=$? if [ $iret -ne 0 ]; then test_failed=1 @@ -57,12 +57,12 @@ done set +x if [ $test_failed -ne 0 ]; then - echo "<<< C96 VIIRS VEGT TEST FAILED. >>>" + echo "<<< C96 VIIRS BNU TEST FAILED. >>>" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "c96.viirs.vegt" $commit_num + $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "c96.viirs.bnu" $commit_num fi else - echo "<<< C96 VIIRS VEGT TEST PASSED. >>>" + echo "<<< C96 VIIRS BNU TEST PASSED. >>>" fi exit 0 diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh index 97fa020d0..c0211cc73 100755 --- a/reg_tests/grid_gen/driver.hera.sh +++ b/reg_tests/grid_gen/driver.hera.sh @@ -70,12 +70,12 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_ -o $LOG_FILE1 -e $LOG_FILE1 ./c96.uniform.sh) #----------------------------------------------------------------------------- -# C96 uniform grid using viirs vegetation data. +# C96 uniform grid using viirs vegetation and bnu soil data. #----------------------------------------------------------------------------- LOG_FILE2=${LOG_FILE}02 -TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \ - --partition=bigmem -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh) +TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \ + --partition=bigmem -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh) #----------------------------------------------------------------------------- # gfdl regional grid diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh index 2d3f5fcfc..1b33b05df 100755 --- a/reg_tests/grid_gen/driver.jet.sh +++ b/reg_tests/grid_gen/driver.jet.sh @@ -68,12 +68,12 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_ --partition=xjet -o $LOG_FILE1 -e $LOG_FILE1 ./c96.uniform.sh) #----------------------------------------------------------------------------- -# C96 uniform grid using viirs vegetation type data. +# C96 uniform grid using viirs vegetation type and bnu soil type data. #----------------------------------------------------------------------------- LOG_FILE2=${LOG_FILE}02 -TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \ - --partition=xjet -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh) +TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \ + --partition=xjet -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh) #----------------------------------------------------------------------------- # gfdl regional grid diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh index a3a60e678..987e33d19 100755 --- a/reg_tests/grid_gen/driver.orion.sh +++ b/reg_tests/grid_gen/driver.orion.sh @@ -66,12 +66,12 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_ -o $LOG_FILE1 -e $LOG_FILE1 ./c96.uniform.sh) #----------------------------------------------------------------------------- -# C96 uniform grid using viirs vegetation type data. +# C96 uniform grid using viirs vegetation and bnu soil type data. #----------------------------------------------------------------------------- LOG_FILE2=${LOG_FILE}02 -TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \ - -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh) +TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \ + -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh) #----------------------------------------------------------------------------- # GFDL regional grid diff --git a/reg_tests/grid_gen/driver.wcoss2.sh b/reg_tests/grid_gen/driver.wcoss2.sh index da8b9d0ed..398765e1c 100755 --- a/reg_tests/grid_gen/driver.wcoss2.sh +++ b/reg_tests/grid_gen/driver.wcoss2.sh @@ -71,12 +71,12 @@ TEST1=$(qsub -V -o $LOG_FILE1 -e $LOG_FILE1 -q $QUEUE -A $PROJECT_CODE -l wallti -N c96.uniform -l select=1:ncpus=30:mem=40GB $PWD/c96.uniform.sh) #----------------------------------------------------------------------------- -# C96 uniform grid using viirs vegetation data. +# C96 uniform grid using viirs vegetation and bnu soil type data. #----------------------------------------------------------------------------- LOG_FILE2=${LOG_FILE}02 -TEST2=$(qsub -V -o $LOG_FILE2 -e $LOG_FILE2 -q $QUEUE -A $PROJECT_CODE -l walltime=00:10:00 \ - -N c96.viirs.vegt -l select=1:ncpus=30:mem=40GB $PWD/c96.viirs.vegt.sh) +TEST2=$(qsub -V -o $LOG_FILE2 -e $LOG_FILE2 -q $QUEUE -A $PROJECT_CODE -l walltime=00:15:00 \ + -N c96.viirs.bnu -l select=1:ncpus=30:mem=250GB $PWD/c96.viirs.bnu.sh) #----------------------------------------------------------------------------- # gfdl regional grid From 4bc4e85b0b04592fdd55693d791711d7e09026ce Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 21 Aug 2023 08:55:48 -0500 Subject: [PATCH 12/17] Adjust requested resources for Orion grid_gen regression tests. Fixes #821. --- reg_tests/grid_gen/driver.orion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh index 987e33d19..9a50ae251 100755 --- a/reg_tests/grid_gen/driver.orion.sh +++ b/reg_tests/grid_gen/driver.orion.sh @@ -70,7 +70,7 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_ #----------------------------------------------------------------------------- LOG_FILE2=${LOG_FILE}02 -TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \ +TEST2=$(sbatch --parsable --ntasks-per-node=15 --nodes=2 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \ -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh) #----------------------------------------------------------------------------- From 397cd434ebc3dc4235000d4433474cae93450715 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 21 Aug 2023 14:24:06 +0000 Subject: [PATCH 13/17] Request additional resources for Jet grid_gen regression tests. Fixes #821. --- reg_tests/grid_gen/driver.jet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh index 1b33b05df..6641098bc 100755 --- a/reg_tests/grid_gen/driver.jet.sh +++ b/reg_tests/grid_gen/driver.jet.sh @@ -72,7 +72,7 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_ #----------------------------------------------------------------------------- LOG_FILE2=${LOG_FILE}02 -TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \ +TEST2=$(sbatch --parsable --ntasks-per-node=10 --nodes=3 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \ --partition=xjet -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh) #----------------------------------------------------------------------------- From 5ea89bc0e76c21ad969aa5f22594b81144596a0e Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 21 Aug 2023 19:19:55 +0000 Subject: [PATCH 14/17] Update 'readthedocs' for the new substrate temperature data. Fixes #821. --- docs/source/ufs_utils.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst index 5bb1b0d0e..d563f0a6b 100644 --- a/docs/source/ufs_utils.rst +++ b/docs/source/ufs_utils.rst @@ -528,7 +528,7 @@ The surface climatological data is located here `./fix/fix_sfc_climo Date: Thu, 21 Sep 2023 15:06:49 +0000 Subject: [PATCH 15/17] Update for 'v3' of data. Fixes #821. --- docs/source/ufs_utils.rst | 4 ++-- driver_scripts/driver_grid.hera.sh | 8 ++++---- driver_scripts/driver_grid.jet.sh | 8 ++++---- driver_scripts/driver_grid.orion.sh | 8 ++++---- driver_scripts/driver_grid.wcoss2.sh | 8 ++++---- reg_tests/grid_gen/c96.viirs.bnu.sh | 4 ++-- util/sfc_climo_gen/sfc_gen.sh | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/source/ufs_utils.rst b/docs/source/ufs_utils.rst index d563f0a6b..314c179b9 100644 --- a/docs/source/ufs_utils.rst +++ b/docs/source/ufs_utils.rst @@ -539,14 +539,14 @@ The surface climatological data is located here `./fix/fix_sfc_climo Date: Fri, 22 Sep 2023 08:19:07 -0500 Subject: [PATCH 16/17] Increase stack size for creating grids on Orion. Fixes #821. --- driver_scripts/driver_grid.orion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver_scripts/driver_grid.orion.sh b/driver_scripts/driver_grid.orion.sh index e0ac9fc4e..c0190f4d9 100755 --- a/driver_scripts/driver_grid.orion.sh +++ b/driver_scripts/driver_grid.orion.sh @@ -161,7 +161,7 @@ export OMP_NUM_THREADS=24 export OMP_STACKSIZE=2048m ulimit -a -ulimit -s 199000000 +ulimit -s unlimited #----------------------------------------------------------------------- # Start script. From 62294be7f2e130f3c68797f51e00fde5cc2d3e9b Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 26 Sep 2023 17:50:42 +0000 Subject: [PATCH 17/17] Update link_fixdirs.sh to point to new fixed data directory that contains the new soil and veg files. Fixes #821. --- fix/link_fixdirs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh index 7fcc370c6..7e9d28025 100755 --- a/fix/link_fixdirs.sh +++ b/fix/link_fixdirs.sh @@ -58,7 +58,7 @@ fi am_ver=${am_ver:-20220805} orog_ver=${orog_ver:-20220805} -sfc_climo_ver=${sfc_climo_ver:-20221017} +sfc_climo_ver=${sfc_climo_ver:-20230925} for dir in am orog orog_raw sfc_climo; do if [ -d $dir ]; then