Update variable_map --> varmap in analysis scripts and test

Author: xylar

mpas_analysis/ocean/ocean_modelvsobs.py

@@ -139,7 +139,7 @@ def ocn_modelvsobs(config, field, streamMap=None, variableMap=None):
                                              timestr='Time',
                                              onlyvars=varList,
                                              selvals=selvals,
-                                             variable_map=variableMap))
+                                             varmap=variableMap))
     ds = remove_repeated_time_index(ds)
 
     time_start = datetime.datetime(yr_offset+climo_yr1, 1, 1)

mpas_analysis/ocean/ohc_timeseries.py

@@ -100,7 +100,7 @@ def ohc_timeseries(config, streamMap=None, variableMap=None):
                                              yearoffset=yr_offset,
                                              timestr='Time',
                                              onlyvars=varList,
-                                             variable_map=variableMap))
+                                             varmap=variableMap))
 
     ds = remove_repeated_time_index(ds)
 

mpas_analysis/ocean/sst_timeseries.py

@@ -68,7 +68,7 @@ def sst_timeseries(config, streamMap=None, variableMap=None):
         preprocess=lambda x: preprocess_mpas(x, yearoffset=yr_offset,
                                              timestr='Time',
                                              onlyvars=varList,
-                                             variable_map=variableMap))
+                                             varmap=variableMap))
     ds = remove_repeated_time_index(ds)
 
     # convert the start and end dates to datetime objects using

mpas_analysis/sea_ice/modelvsobs.py

@@ -155,7 +155,7 @@ def seaice_modelvsobs(config, streamMap=None, variableMap=None):
                                              timestr='Time',
                                              onlyvars=['iceAreaCell',
                                                        'iceVolumeCell'],
-                                             variable_map=variableMap))
+                                             varmap=variableMap))
     ds = remove_repeated_time_index(ds)
 
     # Compute climatologies (first motnhly and then seasonally)

mpas_analysis/sea_ice/timeseries.py

@@ -91,7 +91,7 @@ def seaice_timeseries(config, streamMap=None, variableMap=None):
                                              timestr='Time',
                                              onlyvars=['iceAreaCell',
                                                        'iceVolumeCell'],
-                                             variable_map=variableMap))
+                                             varmap=variableMap))
     ds = remove_repeated_time_index(ds)
 
     # convert the start and end dates to datetime objects using

mpas_analysis/test/test_mpas_xarray.py

@@ -176,7 +176,7 @@ def test_variable_map(self):
                 timestr='Time',
                 onlyvars=varList,
                 yearoffset=1850,
-                variable_map=varMap))
+                varmap=varMap))
 
         # make sure the remapping happened as expected
         self.assertEqual(sorted(ds.data_vars.keys()), sorted(varList))