From 7626e8ced44b2532b1f1363af938cd571af9fc77 Mon Sep 17 00:00:00 2001
From: Ingrid Luijx <ingrid.vanderlaan@wur.nl>
Date: Fri, 16 May 2014 13:01:09 +0000
Subject: [PATCH] Fixed expand molefractions and fluxes to run independently

---
 da/analysis/expand_fluxes.py        | 4 ++--
 da/analysis/expand_molefractions.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/da/analysis/expand_fluxes.py b/da/analysis/expand_fluxes.py
index 5a03276..3ed5f65 100755
--- a/da/analysis/expand_fluxes.py
+++ b/da/analysis/expand_fluxes.py
@@ -1085,12 +1085,12 @@ if __name__ == "__main__":
     logging.root.setLevel(logging.DEBUG)
 
     dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'})
+    dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc')
+    dacycle.dasystem = dasystem
     dacycle.setup()
     dacycle.parse_times()
 
-    dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc')
 
-    dacycle.dasystem = dasystem
 
     statevector = CO2StateVector()
     statevector.setup(dacycle)
diff --git a/da/analysis/expand_molefractions.py b/da/analysis/expand_molefractions.py
index 33bf2ce..2a5d9cb 100755
--- a/da/analysis/expand_molefractions.py
+++ b/da/analysis/expand_molefractions.py
@@ -341,12 +341,12 @@ if __name__ == "__main__":
     logging.root.setLevel(logging.DEBUG)
 
     dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'})
+    dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc')
+    dacycle.dasystem = dasystem
     dacycle.setup()
     dacycle.parse_times()
 
-    dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc')
 
-    dacycle.dasystem = dasystem
 
     while dacycle['time.start'] < dacycle['time.finish']:
 
-- 
GitLab