Merge pull request #18 from LabSid-USP/17-Remover-todas-ocorr-ncias-d…

…e-auxQtot-outAuxRec 17 remover todas ocorr ncias de aux qtot out aux rec
LabSid-USP · Jun 29, 2021 · c113cae · c113cae
2 parents 21bc2b7 + 9bd16b5
commit c113cae
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/rubem.py b/rubem.py
@@ -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
@@ -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))
@@ -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
@@ -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():
@@ -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)