changed for new baseclass interface

das.py

@@ -31,6 +31,7 @@ validprocess=['jobstart','jobinput','sample','invert','propagate','resubmit','al
 
 def JobStart(opts,args):
     """ Set up the job specific directory structure and create an expanded rc-file """
+    from da.tools.initexit import CycleControl
 
     DaCycle = CycleControl(opts,args)
 
@@ -145,7 +146,10 @@ def Advance( ):
 def SaveAndSubmit( ):
     """ Save the model state and submit the next job """
 
-    dummy = StateVector.WriteToFile()
+    savedir         = CycleInfo.da_settings['dir.save']
+    filename        = os.path.join(savedir,'savestate.nc')
+
+    dummy = StateVector.WriteToFile(filename)
     dummy = CycleInfo.Finalize()
 
     return None
@@ -162,7 +166,6 @@ if __name__ == "__main__":
 
 # Import methods and classes contained in this package
 
-    from da.tools.initexit import CycleControl
     from da.tools.general import CleanUpCycle
     from da.tools.general import ValidateOptsArgs
     from da.tools.general import ParseOptions
@@ -186,23 +189,23 @@ if __name__ == "__main__":
     msg         = header+"starting JobStart"+footer           ; logging.info(msg) 
     CycleInfo   = JobStart(opts,args)
 
-    msg   = header+"starting JobInput"+footer           ; logging.info(msg) 
+    msg         = header+"starting JobInput"+footer           ; logging.info(msg) 
     StateVector = JobInput()
 
-    msg   = header+"starting SampleState"+footer         ; logging.info(msg) 
-    dummy = SampleState()
+    msg         = header+"starting SampleState"+footer         ; logging.info(msg) 
+    dummy       = SampleState()
 
-    msg   = header+"starting Invert"+footer             ; logging.info(msg) 
-    dummy = Invert()
+    msg         = header+"starting Invert"+footer             ; logging.info(msg) 
+    dummy       = Invert()
 
-    msg   = header+"starting Advance"+footer          ; logging.info(msg) 
-    dummy = Advance()
+    msg         = header+"starting Advance"+footer          ; logging.info(msg) 
+    dummy       = Advance()
 
-    msg   = header+"starting SaveAndSubmit"+footer      ; logging.info(msg) 
-    dummy = SaveAndSubmit()
+    msg         = header+"starting SaveAndSubmit"+footer      ; logging.info(msg) 
+    dummy       = SaveAndSubmit()
 
-    msg   = "Cycle finished...exiting"     ; logging.info(msg)
+    msg         = "Cycle finished...exiting"     ; logging.info(msg)
 
-    dummy = CleanUpCycle(CycleInfo)
+    dummy       = CleanUpCycle(CycleInfo)
 
     sys.exit(0)