changes on Obs class data structure now propagated to obspack

da/ct/obspack.py

@@ -510,8 +510,8 @@ if __name__ == "__main__":
         obs.add_observations()
         obs.add_model_data_mismatch()
 
-        print(obs.Data.getvalues('obs'))
-        print(obs.Data.getvalues('mdm'))
+        print(obs.getvalues('obs'))
+        print(obs.getvalues('mdm'))
 
         DaCycle.AdvanceCycleTimes()
 

da/ct/obspack_geocarbon.py

@@ -66,7 +66,9 @@ class ObsPackObservations(Observation):
             if line.startswith('#'): continue # header
 
             items = line.split()
-            ncfile, lab , start_date, stop_date, data_comparison = items[0:5]
+            #ncfile, lab , start_date, stop_date, data_comparison = items[0:5]
+            ncfile, lab , start_date, stop_date, data_comparison= line[:105].split()
+
 
             ncfilelist += [ncfile]
 
@@ -93,7 +95,7 @@ class ObsPackObservations(Observation):
             alts = ncf.GetVariable('altitude').take(subselect, axis=0)
             obs = ncf.GetVariable('value').take(subselect, axis=0)
             species = ncf.GetAttribute('dataset_parameter')
-            flags = ncf.GetVariable('obspack_flag').take(subselect, axis=0)
+            flags = ncf.GetVariable('obs_flag').take(subselect, axis=0)
             ncf.close()
 
             for n in range(len(dates)): 
@@ -523,8 +525,8 @@ if __name__ == "__main__":
         obs.add_observations()
         obs.add_model_data_mismatch()
 
-        print(obs.Data.getvalues('obs'))
-        print(obs.Data.getvalues('mdm'))
+        print(obs.getvalues('obs'))
+        print(obs.getvalues('mdm'))
 
         DaCycle.AdvanceCycleTimes()