Skip to content

Commit

Permalink
table_id fx
Browse files Browse the repository at this point in the history
  • Loading branch information
aradhakrishnanGFDL committed Oct 25, 2024
1 parent 75fc450 commit 540cd38
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion catalogbuilder/intakebuilder/getinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def getInfoFromGFDLFilename(filename,dictInfo,logger,configyaml):
output_file_template = ['realm']
if "variable_id" in dictInfo.keys(): dictInfo["variable_id"] = "fixed"
if "frequency" in dictInfo.keys(): dictInfo["frequency"] = "fx"
if "table_id" in dictInfo.keys(): dictInfo["table_id"] = "fixed"
if "table_id" in dictInfo.keys(): dictInfo["table_id"] = "fx"
##
nlen = len(output_file_template)
for i in range(nlen-1,-1,-1): #nlen = 3
Expand Down
4 changes: 0 additions & 4 deletions catalogbuilder/intakebuilder/gfdlcrawler.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ def crawlLocal(projectdir, dictFilter,dictFilterIgnore,logger,configyaml,slow):
if ((len(filename.split('.'))-1) != len(set_ftemplate)):
logger.debug("Skipping "+filename)
continue
else:
print("tmp debugging static", filename)
logger.debug(dirpath+"/"+filename)
dictInfo = {}
dictInfo = getinfo.getProject(projectdir, dictInfo)
Expand All @@ -94,14 +92,12 @@ def crawlLocal(projectdir, dictFilter,dictFilterIgnore,logger,configyaml,slow):
dictInfo = getinfo.getInfoFromFilename(filename,dictInfo, logger)
else:
dictInfo = getinfo.getInfoFromGFDLFilename(filename,dictInfo, logger,configyaml)
print("1. ", dictInfo)
if "variable_id" in dictInfo.keys():
if dictInfo["variable_id"] is not None:
variable_id = dictInfo["variable_id"]
else:
variable_id = ""
dictInfo = getinfo.getInfoFromGFDLDRS(dirpath, projectdir, dictInfo,configyaml,variable_id)
print("2.", dictInfo)
list_bad_modellabel = ["","piControl","land-hist","piClim-SO2","abrupt-4xCO2","hist-piAer","hist-piNTCF","piClim-ghg","piClim-OC","hist-GHG","piClim-BC","1pctCO2"]
list_bad_chunklabel = ['DO_NOT_USE']
if "source_id" in dictInfo:
Expand Down

0 comments on commit 540cd38

Please sign in to comment.