Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Urban mksurfdata update #1157

Merged
merged 5 commits into from
Sep 23, 2020
Merged

Urban mksurfdata update #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c06df6
Add new raw urban surface dataset and building temperature stream fil…
olyson Dec 7, 2018
fe5307d
Read nlevurb from surface dataset instead of hardcoding value
olyson Dec 11, 2018
46b5606
Initialize nlevurb to ispval and check for invalid value before first…
olyson Dec 12, 2018
5ae56f1
Merge tag 'ctsm1.0.dev113' into v2_raw_urban_sfcdata
ekluzek Sep 20, 2020
ff96e24
Revert main code to ctsm1.0.dev113 version, and leave just the change…
ekluzek Sep 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_defaults_ctsm_tools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tools/mksurfdata_map/mksurfdata_map.namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions tools/mksurfdata_map/src/mkfileMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions tools/mksurfdata_map/src/mkurbanparMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tools/mksurfdata_map/src/mkvarctl.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tools/mksurfdata_map/src/mkvarpar.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down