back to one job does all model

das.py

@@ -39,91 +39,35 @@ if __name__ == "__main__":
 
     opts,args   = ValidateOptsArgs(opts,args)
 
-    process     = args['process'].lower()
-
 # Create the Cycle Control object for this job    
 
     DaCycle      = JobStart(opts,args)
 
+    msg          = header+"Initializing Da Cycle"+footer           ; logging.info(msg) 
 
-# Start the requested subprocesses
-
-    if process == 'start':
-
-        msg          = header+"Initializing Da Cycle"+footer           ; logging.info(msg) 
-
-        dummy        = DaCycle.Initialize()
-
-        msg          = header+"starting JobInput"+footer           ; logging.info(msg) 
-
-        StateVector  = JobInput(DaCycle)
-
-        savefilename = os.path.join(DaCycle.da_settings['dir.save'],'statevector.pickle')
-
-        dummy        = StoreData(StateVector,savefilename)
-
-        dummy        = DaCycle.SubmitSubStep('samplestate')
-
-        sys.exit(0)
-
-
-    savefilename = os.path.join(DaCycle.da_settings['dir.save'],'statevector.pickle')
-
-    if process == 'samplestate':
-        msg          = header+"starting SampleState"+footer         ; logging.info(msg) 
-
-        StateVector  = RestoreData(savefilename)
-
-        dummy        = SampleState(DaCycle,StateVector)
-
-        dummy        = StoreData(StateVector,savefilename)
-
-        dummy        = DaCycle.SubmitSubStep('invert')
-
-        dummy        = CleanUpCycle(DaCycle)
-
-        sys.exit(0)
-
-    if process == 'invert':
-        msg          = header+"starting Invert"+footer             ; logging.info(msg) 
-
-        StateVector  = RestoreData(savefilename)
-
-        dummy        = Invert(DaCycle, StateVector)
-
-        StateVector  = StoreData(StateVector,savefilename)
-
-        dummy        = DaCycle.SubmitSubStep('advance')
-
-        dummy        = CleanUpCycle(DaCycle)
-
-        sys.exit(0)
-
+    dummy        = DaCycle.Initialize()
 
-    if process == 'advance':
-        msg          = header+"starting Advance"+footer          ; logging.info(msg) 
+    msg          = header+"starting JobInput"+footer           ; logging.info(msg) 
 
-        StateVector  = RestoreData(savefilename)
+    StateVector  = JobInput(DaCycle)
 
-        dummy        = Advance(DaCycle, StateVector)
+    msg          = header+"starting SampleState"+footer             ; logging.info(msg) 
 
-        StateVector  = StoreData(StateVector,savefilename)
+    dummy        = SampleState(DaCycle,StateVector)
 
-        dummy        = DaCycle.SubmitSubStep('done')
+    msg          = header+"starting Invert"+footer             ; logging.info(msg) 
 
-        dummy        = CleanUpCycle(DaCycle)
+    dummy        = Invert(DaCycle, StateVector)
 
-        sys.exit(0)
+    msg          = header+"starting Advance"+footer          ; logging.info(msg) 
 
-    if process == 'done':
-        msg          = header+"starting SaveAndSubmit"+footer      ; logging.info(msg) 
+    dummy        = Advance(DaCycle, StateVector)
 
-        StateVector  = RestoreData(savefilename)
+    msg          = header+"starting SaveAndSubmit"+footer      ; logging.info(msg) 
 
-        dummy        = SaveAndSubmit(DaCycle, StateVector)
+    dummy        = SaveAndSubmit(DaCycle, StateVector)
 
-        msg          = "Cycle finished...exiting"     ; logging.info(msg)
+    msg          = "Cycle finished...exiting"     ; logging.info(msg)
 
-        dummy        = CleanUpCycle(DaCycle)
+    dummy        = CleanUpCycle(DaCycle)
 
-        sys.exit(0)