Commit 65700662 authored by Peters, Wouter's avatar Peters, Wouter
Browse files

minor changes to make initialize into setup calls

parent 6dad6b69
...@@ -1024,7 +1024,7 @@ if __name__ == "__main__": ...@@ -1024,7 +1024,7 @@ if __name__ == "__main__":
logging.root.setLevel(logging.DEBUG) logging.root.setLevel(logging.DEBUG)
dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'}) dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'})
dacycle.initialize() dacycle.setup()
dacycle.parse_times() dacycle.parse_times()
dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc') dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc')
...@@ -1032,7 +1032,7 @@ if __name__ == "__main__": ...@@ -1032,7 +1032,7 @@ if __name__ == "__main__":
dacycle.dasystem = dasystem dacycle.dasystem = dasystem
statevector = CO2StateVector() statevector = CO2StateVector()
statevector.initialize(dacycle) statevector.setup(dacycle)
while dacycle['time.end'] < dacycle['time.finish']: while dacycle['time.end'] < dacycle['time.finish']:
save_weekly_avg_1x1_data(dacycle, statevector) save_weekly_avg_1x1_data(dacycle, statevector)
......
...@@ -324,7 +324,7 @@ if __name__ == "__main__": ...@@ -324,7 +324,7 @@ if __name__ == "__main__":
logging.root.setLevel(logging.DEBUG) logging.root.setLevel(logging.DEBUG)
dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'}) dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'})
dacycle.initialize() dacycle.setup()
dacycle.parse_times() dacycle.parse_times()
dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc') dasystem = CO2DaSystem('../rc/carbontracker_ct09_opfnew.rc')
......
...@@ -339,11 +339,11 @@ if __name__ == '__main__': # started as script ...@@ -339,11 +339,11 @@ if __name__ == '__main__': # started as script
logging.root.setLevel(logging.DEBUG) logging.root.setLevel(logging.DEBUG)
dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'}) dacycle = CycleControl(args={'rc':'../../ctdas-od-gfed2-glb6x4-obspack-full.rc'})
dacycle.initialize() dacycle.setup()
dacycle.parse_times() dacycle.parse_times()
dasystem = CO2DaSystem('../rc/carbontracker_ct09_opf.rc') dasystem = CO2DaSystem('../rc/carbontracker_ct09_opf.rc')
dasystem.initialize() dasystem.setup()
dacycle.dasystem = dasystem dacycle.dasystem = dasystem
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment