Merge pull request #1157 from ekluzek/urbanmksurfupdate

Urban mksurfdata update
ESCOMP · Sep 23, 2020 · 9ff7810 · 9ff7810
2 parents 5cd28a0 + ff96e24
commit 9ff7810
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/bld/namelist_files/namelist_defaults_ctsm_tools.xml b/bld/namelist_files/namelist_defaults_ctsm_tools.xml
@@ -269,7 +269,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 <!-- urban -->
 <mksrf_furban   hgrid="3x3min"   lmask="LandScan2004"
->lnd/clm2/rawdata/mksrf_urban_0.05x0.05_simyr2000.c120621.nc</mksrf_furban>
+>lnd/clm2/rawdata/mksrf_urban_0.05x0.05_simyr2000.c170724.nc</mksrf_furban>
 
 <mksrf_furban   hgrid="3x3min"   lmask="LandScan2004" sim_year="PtVg"
 >lnd/clm2/rawdata/mksrf_urban_0.05x0.05_zerourbanpct.c181014.nc</mksrf_furban>

diff --git a/tools/mksurfdata_map/mksurfdata_map.namelist b/tools/mksurfdata_map/mksurfdata_map.namelist
@@ -41,7 +41,7 @@
  outnc_double   = .true.
  all_urban      = .false.
  no_inlandwet   = .true.
- mksrf_furban   = '/glade/p/cesm/cseg/inputdata/lnd/clm2/rawdata/mksrf_urban_0.05x0.05_simyr2000.c120621.nc'
+ mksrf_furban   = '/glade/p/cesm/cseg/inputdata/lnd/clm2/rawdata/mksrf_urban_0.05x0.05_simyr2000.c170724.nc'
  mksrf_fvegtyp  = '/glade/p/cesm/cseg/inputdata/lnd/clm2/rawdata/pftcftlandusedynharv.0.25x0.25.MODIS.simyr1850-2015.c170412/mksrf_landuse_histclm50_LUH2_2000.c170412.nc'
  mksrf_fhrvtyp  = '/glade/p/cesm/cseg/inputdata/lnd/clm2/rawdata/pftcftlandusedynharv.0.25x0.25.MODIS.simyr1850-2015.c170412/mksrf_landuse_histclm50_LUH2_2000.c170412.nc'
  mksrf_fsoicol  = '/glade/p/cesm/cseg/inputdata/lnd/clm2/rawdata/pftcftlandusedynharv.0.25x0.25.MODIS.simyr1850-2015.c170412/mksrf_soilcolor_simyr2005.c170413.nc'

diff --git a/tools/mksurfdata_map/src/mkfileMod.F90 b/tools/mksurfdata_map/src/mkfileMod.F90
@@ -8,9 +8,9 @@ subroutine mkfile(domain, fname, harvdata, dynlanduse)
     use shr_kind_mod , only : r8 => shr_kind_r8
     use shr_sys_mod  , only : shr_sys_getenv
     use fileutils    , only : get_filename
-    use mkvarpar     , only : nlevsoi, nlevurb, numrad, numstdpft
+    use mkvarpar     , only : nlevsoi, numrad, numstdpft
     use mkvarctl
-    use mkurbanparMod, only : numurbl
+    use mkurbanparMod, only : numurbl, nlevurb
     use mkglcmecMod  , only : nglcec
     use mkpftMod     , only : mkpftAtt
     use mksoilMod    , only : mksoilAtt

diff --git a/tools/mksurfdata_map/src/mkurbanparMod.F90 b/tools/mksurfdata_map/src/mkurbanparMod.F90
@@ -14,6 +14,7 @@ module mkurbanparMod
 ! !USES:
    use shr_kind_mod, only : r8 => shr_kind_r8
    use shr_sys_mod , only : shr_sys_flush
+   use mkvarctl,     only : ispval
    implicit none
 
    private
@@ -29,8 +30,10 @@ module mkurbanparMod
 
 ! !PUBLIC DATA MEMBERS:
    integer :: numurbl           ! number of urban classes
+   integer :: nlevurb = ispval  ! number of urban layers
 
    public :: numurbl
+   public :: nlevurb
 
 ! !PRIVATE DATA MEMBERS:
    ! flag to indicate nodata for index variables in output file:
@@ -80,6 +83,8 @@ subroutine mkurbanInit(datfname)
    call check_ret(nf_open(datfname, 0, ncid), subname)
    call check_ret(nf_inq_dimid (ncid, 'density_class', dimid), subname)
    call check_ret(nf_inq_dimlen (ncid, dimid, numurbl), subname)
+   call check_ret(nf_inq_dimid (ncid, 'nlevurb', dimid), subname)
+   call check_ret(nf_inq_dimlen (ncid, dimid, nlevurb), subname)
    call check_ret(nf_close(ncid), subname)
 
 end subroutine mkurbanInit

diff --git a/tools/mksurfdata_map/src/mkvarctl.F90 b/tools/mksurfdata_map/src/mkvarctl.F90
@@ -17,6 +17,7 @@ module mkvarctl
   save
 !
   real(r8), public, parameter :: spval = 1.e36    ! special value
+  integer,  public, parameter :: ispval = -9999   ! special value
 
   logical, public    :: outnc_large_files     ! output files in 64-bit format for large files
   logical, public    :: outnc_double          ! output ALL data in files as 64-bit

diff --git a/tools/mksurfdata_map/src/mkvarpar.F90 b/tools/mksurfdata_map/src/mkvarpar.F90
@@ -20,7 +20,6 @@ module mkvarpar
   integer, parameter :: numstdpft = 16! number of standard PFT types
   integer, parameter :: numstdcft = 2 ! of the number of standard PFT types, how many are crop (CFT)
   integer, parameter :: noveg   = 0   ! value for non-vegetated pft
-  integer, parameter :: nlevurb = 5   ! number of urban layers
   integer, parameter :: numsolar = 2  ! number of solar types (Direct,Diffuse)
   integer, parameter :: numrad = 2    ! number of solar bands (VIS,NIR)
   real(r8),parameter :: elev_thresh  = 2600._r8   ! elevation threshold for screening urban areas