Skip to content

Commit 9c390a0

Browse files
slevis-lmwgslevis-lmwg
authored
Merge pull request #3395 from slevis-lmwg/merge-b4bdev-20250807
Merge b4bdev 20250807
2 parents d6f950a + 77ad893 commit 9c390a0

File tree

5 files changed

+144
-1
lines changed

5 files changed

+144
-1
lines changed

‎doc/ChangeLog‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,60 @@
11
===============================================================
2+
Tag name: ctsm5.3.066
3+
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
4+
Date: Fri 08 Aug 2025 09:19:34 AM MDT
5+
One-line Summary: Merge b4b-dev to master
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
PR #3395 making this tag includes:
11+
#3352 Add Fang Li's abm and popden .ncl scripts to /tools/contrib
12+
#3395 Add to README.CHECKLIST.master_tags a new reminder:
13+
"When izumi’s baseline is ready, open read permissions to all"
14+
15+
Significant changes to scientifically-supported configurations
16+
--------------------------------------------------------------
17+
18+
Does this tag change answers significantly for any of the following physics configurations?
19+
(Details of any changes will be given in the "Answer changes" section below.)
20+
21+
[Put an [X] in the box for any configuration with significant answer changes.]
22+
23+
[ ] clm6_0
24+
25+
[ ] clm5_0
26+
27+
[ ] ctsm5_0-nwp
28+
29+
[ ] clm4_5
30+
31+
32+
Bugs fixed
33+
----------
34+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
35+
Addresses part of #2701 New population dataset for streams files
36+
37+
Testing summary:
38+
----------------
39+
40+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
41+
42+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
43+
44+
derecho ----- OK (running aux_clm was redundant given the type of code changes)
45+
izumi ------- OK
46+
47+
Answer changes
48+
--------------
49+
Changes answers relative to baseline: No
50+
51+
Other details
52+
-------------
53+
Pull Requests that document the changes (include PR ids):
54+
https://github.com/ESCOMP/ctsm/pull/3395
55+
56+
===============================================================
57+
===============================================================
258
Tag name: ctsm5.3.065
359
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
460
Date: Mon 28 Jul 2025 09:30:35 AM MDT

‎doc/ChangeSum‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
ctsm5.3.066 slevis 08/08/2025 Merge b4b-dev to master
34
ctsm5.3.065 erik 07/28/2025 Merge b4b-dev to master
45
ctsm5.3.064 slevis 07/24/2025 Add time dimension to 1d_wt fields in transient runs
56
ctsm5.3.063 samrabin 07/10/2025 Merge b4b-dev to master

‎doc/README.CHECKLIST.master_tags‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ if you did step 7 above using git commands that require this step)
8686

8787
---- NOTES ----
8888

89-
(3) -- Always test on your fork with a feature-branch so that we can change tag order if needed. Put
89+
(3a) -- When izumi’s baseline is ready, manually open read permissions to all.
90+
(3b) -- Always test on your fork with a feature-branch so that we can change tag order if needed. Put
9091
baselines in the next tag name, as we can easily change afterwards if needed.
9192

‎tools/contrib/abm_raw.ncl‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
; Script written by Fang Li and emailed to slevis on 2025/07/24
2+
; Script for generating the abm (peak crop-fire month) raw dataset
3+
; /glade/campaign/cesm/cesmdata/cseg/inputdata/lnd/clm2/rawdata/mksrf_abm_0.5x0.5_simyr2000.c250715.nc
4+
; starting from preexisting raw dataset
5+
; /glade/campaign/cesm/cesmdata/cseg/inputdata/lnd/clm2/rawdata/mksrf_abm_0.5x0.5_simyr2000.c240821.nc
6+
7+
f1=addfile("/glade/campaign/cesm/cesmdata/inputdata/lnd/clm2/rawdata/mksrf_abm_0.5x0.5_simyr2000.c240821.nc","r")
8+
abm1=f1->abm
9+
lon1=f1->lon
10+
lat1=f1->lat
11+
12+
fils=systemfunc("ls /glade/work/fangli/obs/GFED5/crop05/BA*.nc")
13+
fs=addfiles(fils,"r")
14+
ListSetType(fs,"join")
15+
baf=fs[:]->baf
16+
bafm=dim_avg_n(baf,0)
17+
18+
f=addfile("fpc_crop05.nc","r") ; MCD12C1 12+14
19+
fpc_crop=f->fpc_crop
20+
21+
fw=addfile("fpc_water05.nc","r")
22+
fpc_water=fw->fpc_water
23+
24+
abm=abm1
25+
do ilat=0, 359
26+
do ilon=0, 719
27+
if(fpc_crop(ilat,ilon).gt.0.005 .and. fpc_water(ilat,ilon).lt.0.5)then
28+
if(sum(bafm(:,ilat,ilon)).gt.0.0)then
29+
abm(ilat,ilon)=maxind(bafm(:,ilat,ilon))+1
30+
else
31+
abm(ilat,ilon)=13
32+
end if
33+
else
34+
abm(ilat,ilon)=14
35+
end if
36+
end do
37+
end do
38+
39+
fout1=addfile("abm05-raw.nc","c")
40+
fout1->abm=abm
41+

‎tools/contrib/popden.ncl‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
; Script written by Fang Li and emailed to slevis on 2025/07/24
2+
; Script for generating the hdm (aka popdens or population density) stream file
3+
; /glade/campaign/cesm/cesmdata/cseg/inputdata/lnd/clm2/firedata/clmforc.Li_2025_CMIP7_hdm_0.5x0.5_simyr1850-2100_c250717.nc
4+
; starting from preexisting file
5+
; /glade/campaign/cesm/cesmdata/cseg/inputdata/lnd/clm2/firedata/clmforc.Li_2018_SSP3_CMIP6_hdm_0.5x0.5_AVHRR_simyr1850-2100_c181205.nc
6+
; and raw data in /glade/work/fangli/hd/TRENDY/pop-dens_input4MIPs_population_CMIP_PIK-CMIP-1-0-0_gr_1850-2025.nc
7+
; Is the latter the same as /glade/campaign/cesm/cesmdata/input4MIPs_raw/input4MIPs/CMIP7/CMIP/PIK/PIK-CMIP-1-0-0 ?
8+
9+
f=addfile("/glade/campaign/cesm/cesmdata/cseg/inputdata/lnd/clm2/firedata/clmforc.Li_2018_SSP3_CMIP6_hdm_0.5x0.5_AVHRR_simyr1850-2100_c181205.nc","r")
10+
hdm=f->hdm
11+
12+
f1=addfile("/glade/work/fangli/hd/TRENDY/pop-dens_input4MIPs_population_CMIP_PIK-CMIP-1-0-0_gr_1850-2025.nc","r")
13+
hdmn=f1->pop_dens
14+
15+
f2=addfile("/glade/work/fangli/hd/TRENDY/ctl05.clm2.h0.1850-01.nc","r")
16+
landfrac=f2->landfrac
17+
landmask=f2->landmask
18+
landf1=landfrac*landmask
19+
landf=landf1
20+
landf(:,0:359)=landf1(:,360:719)
21+
landf(:,360:719)=landf1(:,0:359)
22+
23+
do ilat=0,359
24+
do ilon=0,719
25+
if(ismissing(landf(ilat,ilon)))then
26+
hdm(0:175,ilat,ilon)=(/hdmn(:,ilat,ilon)/)
27+
else
28+
hdm(0:175,ilat,ilon)=(/hdmn(:,ilat,ilon)/landf(ilat,ilon)/)
29+
end if
30+
end do
31+
end do
32+
33+
fout=addfile("clmforc.Li_2025_CMIP7_hdm_0.5x0.5_simyr1850-2100_c250717.nc","c")
34+
vNam=getfilevarnames(f)
35+
do i=0,dimsizes(vNam)-1
36+
if(vNam(dimsizes(vNam)-1-i).ne."hdm")then
37+
x=f->$vNam(dimsizes(vNam)-1-i)$
38+
fout->$vNam(dimsizes(vNam)-1-i)$=x
39+
delete(x)
40+
else
41+
fout->hdm=hdm
42+
end if
43+
end do
44+

0 commit comments

Comments
 (0)