From 15d0cbed1f5cf6df649c7a05617f939377dc2bd0 Mon Sep 17 00:00:00 2001 From: Peter Lawrence Date: Thu, 8 Nov 2018 15:34:46 -0700 Subject: [PATCH] The logic of mksurfdata_map has been updated to include the glaciers as well as lakes and wetlands outside of the landmask with new code: < ! Assume wetland, glacier and/or lake when dataset landmask implies ocean < if (pctgla(n) < 1.e-6_r8) then < pctwet(n) = 100._r8 - pctlak(n) < pctgla(n) = 0._r8 < else < pctwet(n) = 100._r8 - pctgla(n) - pctlak(n) < end if from > ! Assume wetland and/or lake when dataset landmask implies ocean > pctwet(n) = 100._r8 - pctlak(n) > pctgla(n) = 0._r8 --- tools/mksurfdata_map/src/mksurfdat.F90 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/mksurfdata_map/src/mksurfdat.F90 b/tools/mksurfdata_map/src/mksurfdat.F90 index 5089fabf7d..b7ee945511 100644 --- a/tools/mksurfdata_map/src/mksurfdat.F90 +++ b/tools/mksurfdata_map/src/mksurfdat.F90 @@ -704,16 +704,20 @@ program mksurfdat do n = 1,ns_o - ! Assume wetland and/or lake when dataset landmask implies ocean + ! Assume wetland, glacier and/or lake when dataset landmask implies ocean ! (assume medium soil color (15) and loamy texture). ! Also set pftdata_mask here if (pctlnd_pft(n) < 1.e-6_r8) then pftdata_mask(n) = 0 soicol(n) = 15 - pctwet(n) = 100._r8 - pctlak(n) + if (pctgla(n) < 1.e-6_r8) then + pctwet(n) = 100._r8 - pctlak(n) + pctgla(n) = 0._r8 + else + pctwet(n) = 100._r8 - pctgla(n) - pctlak(n) + end if pcturb(n) = 0._r8 - pctgla(n) = 0._r8 call pctnatpft(n)%set_pct_l2g(0._r8) call pctcft(n)%set_pct_l2g(0._r8) pctsand(n,:) = 43._r8