Skip to content

Commit 04881a6

Browse files
committed
Fix for calendar=auto in run_ccam.py
1 parent d65e5e6 commit 04881a6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

run_ccam.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2245,7 +2245,7 @@ def check_var_in_file(fname, vname):
22452245
def check_attribute_in_file(fname, vname, aname, vdata):
22462246
"Checks if attribute in file matches required value"
22472247

2248-
file_test = subprocess.getoutput('ncdump -c '+fname+' | grep '+vname+' | grep '+aname+' | grep -o --text '+vdata+') == "'+vdata+'"')
2248+
file_test = subprocess.getoutput('ncdump -c '+fname+' | grep '+vname+' | grep '+aname+' | grep -o --text '+vdata) == vdata
22492249
return file_test
22502250

22512251

@@ -2890,7 +2890,7 @@ def cc_template_cordex():
28902890
def cc_template_basic():
28912891
"pcc2hist namelist for basic standard output"
28922892

2893-
d['hnames'] = '"pr","ta","ts","ua","va","psl","tas","uas","vas","hurs","orog","tasmax","tasmin","sfcWind","zg","hus","qlg","qfg","wa","theta","omega","cfrac","prw","clwvi","clivi","zmla","ustar","clt","clh","clm","cll","rsds","rlds","rsus","rlus","prgr","prsn","sund","rsut","rlut","rsdt","hfls","hfss","CAPE","CIN","prc","evspsbl","mrro","mrros","snm","hurs","huss","ps","tauu","tauv","snw","snc","snd","siconca","z0","evspsblpot","tdew","tsl","mrsol","mrsfl","orog","alb","sftlf","grid","sdischarge"'
2893+
d['hnames'] = '"pr","ta","ts","ua","va","psl","tas","uas","vas","hurs","orog","tasmax","tasmin","sfcWind","zg","hus","qlg","qfg","wa","theta","omega","cfrac","prw","clwvi","clivi","zmla","ustar","clt","clh","clm","cll","rsds","rlds","rsus","rlus","prgr","prsn","sund","rsut","rlut","rsdt","hfls","hfss","CAPE","CIN","LI","prc","evspsbl","mrro","mrros","snm","hurs","huss","ps","tauu","tauv","snw","snc","snd","siconca","z0","evspsblpot","tdew","tsl","mrsol","mrsfl","alb","sftlf","grid","sdischarge","rnd24"'
28942894
d['use_depth'] = 'F'
28952895

28962896
fname = dict2str('{histfile}.000000')

0 commit comments

Comments
 (0)