changed names of output routines for sample info

gridded/da/tools/pipeline.py

@@ -221,8 +221,8 @@ def sample_step(dacycle, samples, statevector, obsoperator, lag, advance=False):
 
     samples.add_model_data_mismatch(dacycle.dasystem['obs.sites.rc']) 
     
-    sampling_coords_file = os.path.join(dacycle['dir.input'], 'observations_%s.nc' % dacycle['time.sample.stamp'])
-    samples.write_sample_info(sampling_coords_file) 
+    sampling_coords_file = os.path.join(dacycle['dir.input'], 'sample_coordinates_%s.nc' % dacycle['time.sample.stamp'])
+    samples.write_sample_coords(sampling_coords_file) 
     # Write filename to dacycle, and to output collection list
     dacycle['ObsOperator.inputfile'] = sampling_coords_file
 
@@ -242,7 +242,7 @@ def sample_step(dacycle, samples, statevector, obsoperator, lag, advance=False):
 
     # Now write a small file that holds for each observation a number of values that we need in postprocessing
 
-    #filename = samples.write_sample_info() 
+    #filename = samples.write_sample_coords() 
 
     # Now add the observations that need to be assimilated to the statevector. 
     # Note that obs will only be added to the statevector if either this is the first step (restart=False), or lag==nlag
@@ -318,8 +318,8 @@ def advance(dacycle, samples, statevector, obsoperator):
     dacycle.output_filelist.append(dacycle['ObsOperator.inputfile'])
     logging.debug("Appended Observation filename to dacycle for collection ")
 
-    outfile = os.path.join(dacycle['dir.output'], 'sampleinfo_%s.nc' % dacycle['time.sample.stamp'])
-    samples.write_obs_to_file(outfile)
+    outfile = os.path.join(dacycle['dir.output'], 'sample_auxiliary_%s.nc' % dacycle['time.sample.stamp'])
+    samples.write_sample_auxiliary(outfile)
 
 
 def save_and_submit(dacycle, statevector):