Renamed external libraries configuration function

socib · Nov 22, 2017 · 6391188 · 6391188
1 parent bb78035
commit 6391188
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 92 deletions.
diff --git a/config/configTemplate.txt b/config/configTemplate.txt
@@ -121,6 +121,7 @@
     local_paths.figure_path       = figures
     local_paths.processing_log    = processing.log
     local_paths.netcdf_l0         = netcdf/netcdf_L0.nc
+    local_paths.netcdf_eng        = netcdf/netcdf_ENG.nc
     local_paths.netcdf_l1         = netcdf/netcdf_L1.nc
     local_paths.netcdf_egol1      = netcdf/netcdf_EGO_L1.nc
     local_paths.netcdf_l2         = netcdf/netcdf_L2.nc

diff --git a/m/configWRCPrograms.m b/m/configWRCPrograms.m
diff --git a/m/config_tools/configExternalLibs.m → m/config_tools/configWRCPrograms.m b/m/config_tools/configExternalLibs.m → m/config_tools/configWRCPrograms.m
@@ -1,17 +1,17 @@
-function wrcprogs = configExternalLibs(glider_toolbox_dir)
-%  CONFIGEXTERNALLIBS  Configure path of the Slocum glider programs provided by WRC.
+function wrcprogs = configWRCPrograms(glider_toolbox_dir)
+%  CONFIGWRCPROGRAMS  Configure path of the Slocum glider programs provided by WRC.
 %
 %  Syntax:
-%    WRCPROGS = CONFIGEXTERNALLIBS()
+%    WRCPROGS = CONFIGWRCPROGRAMS()
 %
 %  Description:
-%    WRCPROGS = CONFIGEXTERNALLIBS() should return a struct with the path to
+%    WRCPROGS = CONFIGWRCPROGRAMS() should return a struct with the path to
 %    the executables provided by the Webb Research Company to deal with Slocum
 %    glider data files. This function replaces the configWRCPrograms and
 %    assumes that the external libraries are installed under the
-%    GLIDER_TOOLBOX_DIR/ext_lib/bin. Contrary to configWRCPrograms, this
+%    GLIDER_TOOLBOX_DIR/ext_lib/bin. Contrary as in previous versions, this
 %    function must not be edited. Users must use the configuration files to
-%    overwrite the values returned by CONFIGEXTERNALLIBS if their external
+%    overwrite the values returned by CONFIGWRCPROGRAMS if their external
 %    libraries live in a different path. Read SETUPCONFIGURATION for more
 %    details.
 %
@@ -23,7 +23,7 @@
 %    XBD2DBA function.
 %
 %  Examples:
-%    wrcprogs = configExternalLibs()
+%    wrcprogs = configWRCPrograms()
 %
 %  See also:
 %    XBD2DBA

diff --git a/m/config_tools/setupConfiguration.m b/m/config_tools/setupConfiguration.m
@@ -235,8 +235,8 @@
 
 
     %% Configure external tools.
-    config.wrcprogs = configExternalLibs(glider_toolbox_dir);
-    config.wrcprogs.status = 'configExternalLibs';
+    config.wrcprogs = configWRCPrograms(glider_toolbox_dir);
+    config.wrcprogs.status = 'configWRCPrograms';
 
     if ~isempty(readconfig) && isfield(readconfig, 'wrcprogs')
         if isfield(readconfig.wrcprogs, 'fconfig')