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

17 remover todas ocorr ncias de aux qtot out aux rec #18

Merged
merged 2 commits into from
Jun 29, 2021
Merged

17 remover todas ocorr ncias de aux qtot out aux rec #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dee6ab
Remove unnecessarry variables
soaressgabriel Jun 29, 2021
9bd16b5
Remove unnecessary variables and function calls
soaressgabriel Jun 29, 2021
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
16 changes: 4 additions & 12 deletions rubem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ def __init__(self):
self.OutTssLf = 'outLf'
self.OutTssRec = 'outRec'
self.OutTssSsat = 'outSsat'
self.OutTssAuxQtot = 'outAuxQtot'
self.OutTssAuxRec = 'outAuxRec'

# Report file
# name
Expand Down Expand Up @@ -152,9 +150,7 @@ def initial(self):
self.TssFileEtp = pcrfw.TimeoutputTimeseries(self.OutTssEtp, self, self.sampleLocs, noHeader=True)
self.TssFileLf = pcrfw.TimeoutputTimeseries(self.OutTssLf, self, self.sampleLocs, noHeader=True)
self.TssFileRec = pcrfw.TimeoutputTimeseries(self.OutTssRec, self, self.sampleLocs, noHeader=True)
self.TssFileSsat = pcrfw.TimeoutputTimeseries(self.OutTssSsat, self, self.sampleLocs, noHeader=True)
self.TssFileAuxQtot = pcrfw.TimeoutputTimeseries(self.OutTssAuxQtot, self, self.sampleLocs, noHeader=True)
self.TssFileAuxRec = pcrfw.TimeoutputTimeseries(self.OutTssAuxRec, self, self.sampleLocs, noHeader=True)
self.TssFileSsat = pcrfw.TimeoutputTimeseries(self.OutTssSsat, self, self.sampleLocs, noHeader=True)

# Read min and max ndvi
self.ndvi_min = pcrfw.scalar(pcrfw.readmap(self.ndviMinFile))
Expand Down Expand Up @@ -364,9 +360,7 @@ def dynamic(self):
'Lf' : self.TssFileLf.sample,
'Rec' : self.TssFileRec.sample,
'Ssat' : self.TssFileSsat.sample,
'Runoff' : self.TssFileRun.sample,
'auxQtot' : self.TssFileAuxQtot.sample,
'auxRec' : self.TssFileAuxRec.sample
'Runoff' : self.TssFileRun.sample
}

# Variable dictionary to export according to filename
Expand All @@ -378,9 +372,7 @@ def dynamic(self):
'Lf' : self.LF,
'Rec' : self.REC,
'Ssat' : self.TUr,
'Runoff' : self.runoff,
'auxQtot' : self.Qtot,
'auxRec' : self.REC
'Runoff' : self.runoff
}

for fileName, isSelected in genFilesDic.items():
Expand Down Expand Up @@ -433,7 +425,7 @@ def dynamic(self):
os.mkdir(str(config.get('FILES', 'output')))

# Store which variables have or have not been selected for export
genFilesList = ['Int', 'Bflow', 'SfRun', 'Etp', 'Lf', 'Rec', 'Ssat', 'Runoff', 'auxQtot', 'auxRec']
genFilesList = ['Int', 'Bflow', 'SfRun', 'Etp', 'Lf', 'Rec', 'Ssat', 'Runoff']
genFilesDic = {}
for file in genFilesList:
genFilesDic[file] = config.getboolean('GENERATE_FILE', file)
Expand Down