Small changes to make the forward pipeline work again

da/tools/pipeline.py

@@ -80,7 +80,7 @@ def forward_pipeline(dacycle, platform, dasystem, samples, statevector, obsopera
     # This could cause problems. Moreover, this method allows us to read older formatted savestate.nc files (legacy) and write them into
     # the current format through the "write_to_file" method.
 
-    savefilename = os.path.join(dacycle['dir.restart.current'], 'savestate_%s.nc' % dacycle['time.start'].strftime('%Y%m%d'))
+    savefilename = os.path.join(dacycle['dir.restart'], 'savestate_%s.nc' % dacycle['time.start'].strftime('%Y%m%d'))
     statevector.write_to_file(savefilename, 'prior')
 
     # Now read optimized fluxes which we will actually use to propagate through the system
@@ -88,7 +88,7 @@ def forward_pipeline(dacycle, platform, dasystem, samples, statevector, obsopera
     if not fwddir:
 
         # if there is no forward dir specified, we simply run forward with unoptimized prior fluxes in the statevector
-        logging.info("Running forward with prior savestate from: %s"%filename)
+        logging.info("Running forward with prior savestate from: %s"%savefilename)
 
     else: 
 
@@ -206,7 +206,7 @@ def prepare_state(dacycle, statevector):
     """ Set up the input data for the forward model: obs and parameters/fluxes"""
 
     # We now have an empty statevector object that we need to populate with data. If this is a continuation from a previous cycle, we can read
-    # the previous statevector values from a NetCDF file in the restart/current directory. If this is the first cycle, we need to populate the statevector
+    # the previous statevector values from a NetCDF file in the restart directory. If this is the first cycle, we need to populate the statevector
     # with new values for each week. After we have constructed the statevector, it will be propagated by one cycle length so it is ready to be used
     # in the current cycle