Bug fix

Fixed a bug in the writing of ECMWF files
e5k · Jul 27, 2018 · 1a209b7 · 1a209b7
1 parent 85013e9
commit 1a209b7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 3 deletions.
diff --git a/CODE/dwind/process_wind.m b/CODE/dwind/process_wind.m
@@ -184,7 +184,7 @@ function process_wind(varargin)
 
             stor_data(iL,:,tI) = [z, speed, angle];                     % Convert vectors to wind speed and direction and fill the storage matrix
         end
-        dlmwrite(fullfile(out_path, [num2str(tI, '%05i'), '.gen']), stor_data(:,:,tI), 'delimiter', '\t', 'precision', 5);     % Write the wind file
+        dlmwrite(fullfile(out_path, [num2str(tI, '%05i'), '.gen']), sortrows(stor_data(:,:,tI),1), 'delimiter', '\t', 'precision', 5);     % Write the wind file
         tI = tI+1;
     end  
 
@@ -222,7 +222,7 @@ function process_wind(varargin)
 
                 stor_data(iL,:,tI) = [z, speed, angle];                     % Convert vectors to wind speed and direction and fill the storage matrix
             end
-            dlmwrite(fullfile(out_path, [num2str(tI, '%05i'), '.gen']), stor_data(:,:,tI), 'delimiter', '\t', 'precision', 5);     % Write the wind file
+            dlmwrite(fullfile(out_path, [num2str(tI, '%05i'), '.gen']), sortrows(stor_data(:,:,tI),1), 'delimiter', '\t', 'precision', 5);     % Write the wind file
             tI = tI+1;
         end     
     end

diff --git a/CODE/load_run.m b/CODE/load_run.m
@@ -103,6 +103,7 @@
     load('tmp.mat', 'tmp');
     project.run_pth = tmp.run_pth;
     project.grd_pth = tmp.grd_pth;
+    project.run_name = tmp.run_name;
     project.vent    = tmp.vent;
     if isfield(tmp, 'points')
         project.points = tmp.points;
@@ -115,6 +116,9 @@
 
     project.grd_type    = tmp.grd_type;
 
+    project.par     = tmp.par; 
+    project.cores   = tmp.cores;
+
 else
     % Select run file
     [flname, flpath] = uigetfile('RUNS/*.mat', 'Select a RUN file to open');

diff --git a/CODE/probability_maker.m b/CODE/probability_maker.m
@@ -66,6 +66,8 @@ function probability_maker(varargin)
 for iR = 1:length(runs)
     if length(dir([project.run_pth, 'DATA', filesep, 'dataT2_*.mat'])) < length(runs)
         preProcess(project, runs, prefs);
+    else
+        fprintf('Tephra2 files have already been post processed. To re-process them, delete the dataT2_*.mat files from the DATA/ folder of your run\n')
     end
 end
 

diff --git a/MODEL/forward_src/new_tephra.o b/MODEL/forward_src/new_tephra.o
diff --git a/MODEL/forward_src/tephra2_calc.o b/MODEL/forward_src/tephra2_calc.o
diff --git a/MODEL/tephra2-2012 b/MODEL/tephra2-2012
diff --git a/MODEL/tephra2-2012.exe b/MODEL/tephra2-2012.exe
diff --git a/tephraProb.m b/tephraProb.m
@@ -155,7 +155,7 @@
                 'HorizontalAlignment', 'center',...
                 'BackgroundColor', [.25 .25 .25],...
                 'ForegroundColor', [.9 .5 0],...
-                'String', 'v. 1.5');
+                'String', 'v. 1.5.1');
 
             t.ax = axes(...
                 'parent', t.main,...