1.7.3 runProb now possible from CLI

Author: e5k

CODE/cdsapi-0.2.5/example-glaciers.py

@@ -216,12 +216,25 @@
 points = get(cdp.points_table, 'Data');
 
 figure; hold on; xlabel('Longitude'); ylabel('Latitude');
+
+x = [points{:,3}];
+y = [points{:,2}];
+xx = [min(x), max(x)];
+yy = [min(y), max(y)];
+xE = 0.25*(max(x)-min(x));
+yE = 0.25*(max(y)-min(y));
+
+plot(xx(1)-xE, yy(1)-yE, '.k', 'MarkerSize', 0.1);
+plot(xx(2)+xE, yy(2)+yE, '.k', 'MarkerSize', 0.1);
+plot_openstreetmap('scale', 2);
+
 for i = 1:size(points,1)
     plot(points{i,3}, points{i,2}, 'or', 'MarkerSize', 7, 'MarkerEdgeColor', 'k', 'MarkerFaceColor', 'r');
     text(points{i,3}, points{i,2}, ['  \leftarrow  ', points{i,1}]);
 end
 
-plot_google_map('maptype','terrain', 'MapScale', 1);
+% plot_google_map('maptype','terrain', 'MapScale', 1);
+
 set(gca, 'Layer', 'top');
 
 % Load button

CODE/conf_points.m

@@ -446,13 +446,13 @@
 end
 
 try
-    urlwrite(url,filepath);
+    websave(url,filepath);
 catch % error downloading map
-    warning(['Unable to download map form Google Servers.\n' ...
-        'Matlab error was: %s\n\n' ...
-        'Possible reasons: missing write permissions, no network connection, quota exceeded, or some other error.\n' ...
-        'Consider using an API key if quota problems persist.\n\n' ...
-        'To debug, try pasting the following URL in your browser, which may result in a more informative error:\n%s'], lasterr, url);
+%     warning(['Unable to download map form Google Servers.\n' ...
+%         'Matlab error was: %s\n\n' ...
+%         'Possible reasons: missing write permissions, no network connection, quota exceeded, or some other error.\n' ...
+%         'Consider using an API key if quota problems persist.\n\n' ...
+%         'To debug, try pasting the following URL in your browser, which may result in a more informative error:\n%s'], lasterr, url);
     varargout{1} = [];
     varargout{2} = [];
     varargout{3} = [];

CODE/dependencies/plot_google_map.m

@@ -139,6 +139,7 @@ function process_wind(varargin)
         stor(i).LAT       = ncread(fullfile(in_path, fl(i).name), 'latitude');
         stor(i).LON       = ncread(fullfile(in_path, fl(i).name), 'longitude');
 
+        stor(i).LON(stor(i).LON<0) = 360-abs(stor(i).LON);
         % Find vent coordinates
        if i==1
            if length(stor(i).LAT) == 1 || length(stor(i).LON) == 1
@@ -161,9 +162,10 @@ function process_wind(varargin)
 
     % Do some tests to see if the timestamp is correct
     time    = cat(1,stor.time);
-    minTime = stor(1).time(1);
-    maxTime = stor(i).time(end);
-
+%     minTime = stor(1).time(1);
+%     maxTime = stor(i).time(end);
+    minTime = min(time);
+    maxTime = max(time);
 
     % Check if the maximum time from downloaded data is equal to the
     % theoretical maximum time based on the time dimension

CODE/dwind/process_wind.m

@@ -301,14 +301,14 @@
         'Callback', @PREP_DATA);
 
 function ws(~,~)
-web http://www.volcano.si.edu/search_volcano.cfm -browser
+web http://volcano.si.edu/search_volcano.cfm -browser
 
 function download_data(~, ~)
 global gvp stor htmldata
 
 volcano_code = get(gvp.top_code, 'String');
 
-websave('tmp.html', ['http://www.volcano.si.edu/volcano.cfm?vn=', volcano_code]);
+websave('tmp.html', ['http://volcano.si.edu/volcano.cfm?vn=', volcano_code]);
 
 % Use htmlTableToCell function to retrieve table from html
 tables.idTableBy.plaintextPreceedingTable = '<table class="DivTable" title="Eruption history table for this volcano">';

CODE/gvp/GVP_Eruption_Results.xls

@@ -37,7 +37,7 @@
 %}
 
 
-function runProb
+function runProb_cmd(varargin)
 % Check that you are located in the correct folder!
 if ~exist(fullfile(pwd, 'tephraProb.m'), 'file')
     errordlg(sprintf('You are located in the folder:\n%s\nIn Matlab, please navigate to the root of the TephraProb\nfolder, i.e. where tephraProb.m is located. and try again.', pwd), ' ')
@@ -47,9 +47,13 @@
 global data                                     % Global variable
 
 % Retrieve data from storage
-state = prepare_data(0);
-if state == 0
-    return
+if nargin == 0
+    state = prepare_data(0);
+    if state == 0
+        return
+    end
+else
+    state = prepare_data(varargin{1});
 end
 
 if isfield(data, 'testrun') && isfield(data, 'long_lasting')   
@@ -530,7 +534,7 @@
 %       1: Load run
 global t
 load(fullfile('VAR','tephraProb.mat'));          % Load the description of each variable -> tab
-if mode == 1                                    % If in load mode
+if ~isstruct(mode) && mode == 1                                    % If in load mode
     uiopen('*.mat');                            % Load previous run -> data
     if ~exist('data', 'var')
         return
@@ -543,9 +547,12 @@
         set(t.tab, 'Data', [data.var, data.ini, data.dsc]);
     end
 
-elseif mode == 0  
+elseif ~isstruct(mode) && mode == 0  
     data_gui([tab.var, tab.ini, tab.dsc]);
     state = 1;
+else
+    test_param('cmd','dummy',mode)
+    state = 1;
 end
 
 function load_data(~, ~, ~)
@@ -647,55 +654,90 @@ function data_gui(tab_data)
 uiwait(t.fig);
 
 % Test input parameters
-function test_param(~, ~, t)
-uiresume(t.fig);
-global data                     % Define global variable
-data = struct;                  % Create a new structure storing all data
-tmp  = get(t.tab, 'Data');      % Retrieve data table
-
-% Go through input parameters
-for i = 1:size(tmp, 1)
-    % If line is not empty (i.e. separator)
-    if ~isempty(tmp{i,1}) && ~isempty(tmp{i,2}) && ~isempty(tmp{i,3})
-        if isnan(str2double(tmp{i,2}))                                      % If cell is a string
-            data.(tmp{i,1}) = tmp{i,2}; % = setfield(data, tmp{i,1}, tmp{i,2});
-        else     
-            % Else convert it to double
-            data.(tmp{i,1}) = str2double(tmp{i,2});
-            %data = setfield(data, tmp{i,1}, str2double(tmp{i,2}));
-        end
-    end
-end
+function test_param(cl, ~, t)
+global data
 
-errchk  = 0;
-warnstr = 'The following problems were identified:\n';
-if ~exist(data.grid_pth, 'file')
-    warnstr = strcat(warnstr, '- The path to the grid file does not exist\n'); errchk = 1;
-elseif ~isdir(data.wind_pth)
-    warnstr = strcat(warnstr, '- The path to the wind files does not exist\n'); errchk = 1;
-elseif data.max_ht < data.min_ht
-    warnstr = strcat(warnstr, '- The maximum plume height is lower than the minimum plume height\n'); errchk = 1;
-elseif data.max_mass < data.min_mass
-    warnstr = strcat(warnstr, '- The maximum mass is lower than the minimum mass\n'); errchk = 1;
-elseif data.max_dur < data.min_dur
-    warnstr = strcat(warnstr, '- The maximum duration is lower than the minimum duration\n'); errchk = 1;
-elseif data.min_phi < data.max_phi
-    warnstr = strcat(warnstr, '- The max_phi variable represents the coarsest material, i.e. the smallest number in phi units\n'); errchk = 1;
-elseif data.max_med_phi < data.min_med_phi
-    warnstr = strcat(warnstr, '- The maximum median phi is lower than the minimum median phi\n'); errchk = 1;
-elseif data.max_std_phi < data.min_std_phi
-    warnstr = strcat(warnstr, '- The maximum std phi is lower than the minimum std phi\n'); errchk = 1;
-elseif data.max_agg < data.min_agg
-    warnstr = strcat(warnstr, '- The maximum aggregation coefficient is lower than the minimum maggregation coefficient\n'); errchk = 1;
-end
+if strcmp(cl,'cmd')
+    data = t;
 
-if errchk == 1
-    wrn = warndlg(sprintf(warnstr), ' ');
-    waitfor(wrn);
-    close(t.fig);
-    data_gui(tmp);
 
-else
+    if (data.constrain == 1 && ~isfield(data, 'min_dur')) || (data.constrain == 1 && ~isfield(data, 'max_dur'))
+        error('You set the `constrain` parameter to 1, which requires defining `min_dur` and `max_dur`')
+    elseif data.constrain == 0 && ~isfield(data, 'mass_sample')
+        error('You set the `constrain` parameter to 0, which requires defining `mass_sample`')
+    end
+    
+    
+    if ~exist(data.grid_pth, 'file')
+        error('The path to the grid file does not exist')
+    elseif ~isfolder(data.wind_pth)
+        error('The path to the wind files does not exist')
+    elseif data.max_ht < data.min_ht
+        error('The maximum plume height is lower than the minimum plume height')
+    elseif data.max_mass < data.min_mass
+        error('The maximum mass is lower than the minimum mass')
+    elseif data.max_dur < data.min_dur
+        error('The maximum duration is lower than the minimum duration')
+    elseif data.min_phi < data.max_phi
+        error('The max_phi variable represents the coarsest material, i.e. the smallest number in phi units')
+    elseif data.max_med_phi < data.min_med_phi
+        error('The maximum median phi is lower than the minimum median phi')
+    elseif data.max_std_phi < data.min_std_phi
+        error('The maximum std phi is lower than the minimum std phi')
+    elseif data.max_agg < data.min_agg
+        error('The maximum aggregation coefficient is lower than the minimum aggregation coefficient')
+    end
     data.testrun = 1;
-    close(t.fig);
-end
+else
+    uiresume(t.fig);
+                     % Define global variable
+    data = struct;                  % Create a new structure storing all data
+    tmp  = get(t.tab, 'Data');      % Retrieve data table
+    
+    % Go through input parameters
+    for i = 1:size(tmp, 1)
+        % If line is not empty (i.e. separator)
+        if ~isempty(tmp{i,1}) && ~isempty(tmp{i,2}) && ~isempty(tmp{i,3})
+            if isnan(str2double(tmp{i,2}))                                      % If cell is a string
+                data.(tmp{i,1}) = tmp{i,2}; % = setfield(data, tmp{i,1}, tmp{i,2});
+            else     
+                % Else convert it to double
+                data.(tmp{i,1}) = str2double(tmp{i,2});
+                %data = setfield(data, tmp{i,1}, str2double(tmp{i,2}));
+            end
+        end
+    end
+
+    errchk  = 0;
+    warnstr = 'The following problems were identified:\n';
+    if ~exist(data.grid_pth, 'file')
+        warnstr = strcat(warnstr, '- The path to the grid file does not exist\n'); errchk = 1;
+    elseif ~isfolder(data.wind_pth)
+        warnstr = strcat(warnstr, '- The path to the wind files does not exist\n'); errchk = 1;
+    elseif data.max_ht < data.min_ht
+        warnstr = strcat(warnstr, '- The maximum plume height is lower than the minimum plume height\n'); errchk = 1;
+    elseif data.max_mass < data.min_mass
+        warnstr = strcat(warnstr, '- The maximum mass is lower than the minimum mass\n'); errchk = 1;
+    elseif data.max_dur < data.min_dur
+        warnstr = strcat(warnstr, '- The maximum duration is lower than the minimum duration\n'); errchk = 1;
+    elseif data.min_phi < data.max_phi
+        warnstr = strcat(warnstr, '- The max_phi variable represents the coarsest material, i.e. the smallest number in phi units\n'); errchk = 1;
+    elseif data.max_med_phi < data.min_med_phi
+        warnstr = strcat(warnstr, '- The maximum median phi is lower than the minimum median phi\n'); errchk = 1;
+    elseif data.max_std_phi < data.min_std_phi
+        warnstr = strcat(warnstr, '- The maximum std phi is lower than the minimum std phi\n'); errchk = 1;
+    elseif data.max_agg < data.min_agg
+        warnstr = strcat(warnstr, '- The maximum aggregation coefficient is lower than the minimum aggregation coefficient\n'); errchk = 1;
+    end
+    
+    if errchk == 1
+        wrn = warndlg(sprintf(warnstr), ' ');
+        waitfor(wrn);
+        close(t.fig);
+        data_gui(tmp);
+        
+    else
+        data.testrun = 1;
+        close(t.fig);
+    end
+end