Changeset 26286

Timestamp:

05/21/21 15:41:39 (4 years ago)

Author:

jdquinn

Message:

BUG: Corrected default value of ‘steps’ that jenkins/examples_tests.sh expects; minor formatting cleanup

Location:

issm/trunk-jpl/examples

Files:

• EsaGRACE/runme.m (modified) (6 diffs)
• EsaWahr/runme.m (modified) (10 diffs)

issm/trunk-jpl/examples/EsaGRACE/runme.m

@@ -2 +2 @@
 addpath('../Data','../Functions');
 
-steps=[5]; 
+steps=[1];
 
-if any(steps==1) 
+if any(steps==1)
         disp('   Step 1: Global mesh creation');
 
@@ -18 +18 @@
 
         plotmodel (md,'data',md.mask.ocean_levelset,'edgecolor','k');
-end 
+end
 
-if any(steps==2) 
+if any(steps==2)
         disp('   Step 2: Define loads in meters of ice height equivalent');
         md = loadmodel('./Models/EsaGRACE_Mesh');
@@ -36 +36 @@
                 'view',[90 -90],'caxis',[-.1 .1],...
                 'title','Ice height equivalent [m]');
-end 
+end
 
-if any(steps==3) 
+if any(steps==3)
         disp('   Step 3: Parameterization');
         md = loadmodel('./Models/EsaGRACE_Loads');
@@ -65 +65 @@
 
         save ./Models/EsaGRACE_Parameterization md;
-end 
+end
 
-if any(steps==4) 
+if any(steps==4)
         disp('   Step 4: Solve Esa solver');
         md = loadmodel('./Models/EsaGRACE_Parameterization');
@@ -79 +79 @@
 
         save ./Models/EsaGRACE_Solution md;
-end 
+end
 
-if any(steps==5) 
+if any(steps==5)
         disp('   Step 5: Plot solutions');
         md = loadmodel('./Models/EsaGRACE_Solution');
@@ -140 +140 @@
                 %export_fig(fig_name{kk});
         end
-end 
+end

issm/trunk-jpl/examples/EsaWahr/runme.m

@@ -2 +2 @@
 addpath('../Functions');
 
-steps=[2]; 
+steps=[1];
 
-if any(steps==1) 
+if any(steps==1)
         disp('   Step 1: Mesh creation');
 
@@ -12 +12 @@
 
         plotmodel(md,'data','mesh');
-end 
+end
 
-if any(steps==2) 
+if any(steps==2)
         disp('   Step 2: Anisotropic mesh creation');
 
@@ -28 +28 @@
 
         plotmodel (md,'data','mesh');
-end 
+end
 
-if any(steps==3) 
+if any(steps==3)
         disp('   Step 3: Define loads');
         md = loadmodel('./Models/EsaWahr_Mesh');
@@ -48 +48 @@
 
         plotmodel (md,'data',md.esa.deltathickness,'title','Ice height equivalent [m]');
-end 
+end
 
-if any(steps==4) 
+if any(steps==4)
         disp('   Step 4: Parameterization');
         md = loadmodel('./Models/EsaWahr_Loads');
@@ -74 +74 @@
 
         save ./Models/EsaWahr_Parameterization md;
-end 
+end
 
-if any(steps==5) 
+if any(steps==5)
         disp('   Step 5: Solve Esa solver');
         md = loadmodel('./Models/EsaWahr_Parameterization');
@@ -88 +88 @@
 
         save ./Models/EsaWahr_Solution md;
-end 
+end
 
-if any(steps==6) 
+if any(steps==6)
         disp('   Step 6: Plot solutions');
         md = loadmodel('./Models/EsaWahr_Solution');
@@ -97 +97 @@
         horz_n = md.results.EsaSolution.EsaYmotion*1000;        % [mm]
         horz_e = md.results.EsaSolution.EsaXmotion*1000;        % [mm]
-        horz = sqrt(horz_n.^2+horz_e.^2);                                               % [mm] 
+        horz = sqrt(horz_n.^2+horz_e.^2);                                               % [mm]
 
         set(0,'DefaultAxesFontSize',24,'DefaultAxesLineWidth',1,'DefaultTextFontSize',24,'DefaultLineMarkerSize',6);
@@ -121 +121 @@
                 'colorbarpos',[0.53,0.065,0.18,0.02],'colorbartitle#4','East-west [mm]');
         %export_fig('Fig5.pdf');
-end 
+end
 
-if any(steps==7) 
+if any(steps==7)
         disp('   Step 7: Compare results against Wahr semi-analytic solutions');
         md = loadmodel('./Models/EsaWahr_Solution');
@@ -130 +130 @@
         horz_n = md.results.EsaSolution.EsaYmotion*1000;        % [mm]
         horz_e = md.results.EsaSolution.EsaXmotion*1000;        % [mm]
-        horz = sqrt(horz_n.^2+horz_e.^2);                                               % [mm] 
+        horz = sqrt(horz_n.^2+horz_e.^2);                                               % [mm]
 
         xi=[0:500:100000]; % grid points [m]
@@ -162 +162 @@
                 set(gcf,'color','w');
         %export_fig('Fig6.pdf');
-end 
+end