Changeset 21129

Timestamp:

08/10/16 13:57:55 (9 years ago)

Author:

glperez

Message:

FIX: Runme step changed to steps
FIX: jenkins script IceFlow to Iceflow

Location:

issm/trunk-jpl

Files:

• examples/Pig/runme.m (modified) (8 diffs)
• examples/PigSensitivity/runme.m (modified) (4 diffs)
• jenkins/jenkins.sh (modified) (2 diffs)

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

@@ -1 @@
-step=[1];
+steps=[1];
 
-if any(step==1)   %Mesh Generation #1
+if any(steps==1)   %Mesh Generation #1
         %Mesh parameters
         domain =['./DomainOutline.exp'];
@@ -57 +57 @@
 end
 
-if any(step==2)  %Masks #2
+if any(steps==2)  %Masks #2
 
         md = loadmodel('./Models/PIG_Mesh_generation'); 
@@ -86 +86 @@
 end
 
-if any(step==3)  %Parameterization #3
+if any(steps==3)  %Parameterization #3
 
         md = loadmodel('./Models/PIG_SetMask');
@@ -98 +98 @@
 end
 
-if any(step==4)  %Control Method #4
+if any(steps==4)  %Control Method #4
 
         md = loadmodel('./Models/PIG_Parameterization');
@@ -104 +104 @@
         % Control general
         md.inversion.iscontrol=1;
-        md.inversion.maxsteps=20;
+        md.inversion.maxstepss=20;
         md.inversion.maxiter=40;
         md.inversion.dxmin=0.1;
@@ -141 +141 @@
 end
 
-if any(step==5) %Plot #5
+if any(steps==5) %Plot #5
 
         md = loadmodel('./Models/PIG_Control_drag');
@@ -158 +158 @@
 end
 
-if any(step==6)  %Higher-Order #6
+if any(steps==6)  %Higher-Order #6
 
         % Load Model
@@ -174 +174 @@
 end
 
-if any(step==7)  %Plot #7
+if any(steps==7)  %Plot #7
 
         mdHO = loadmodel('./Models/PIG_ModelHO');

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

@@ -1 @@
-step=[1];
+steps=[1];
 
-if any(step==1) %Transient Run #1
+if any(steps==1) %Transient Run #1
 
         md = loadmodel('../Pig/Models/PIG_Control_drag');       
@@ -26 +26 @@
 end
 
-if any(step==2) %High Melt #2
+if any(steps==2) %High Melt #2
         md = loadmodel('./Models/PIG_Transient');       
 
@@ -41 +41 @@
 end
 
-if any(step==3) %Ice Front retreat
+if any(steps==3) %Ice Front retreat
         md = loadmodel('./Models/PIG_Transient');       
 
@@ -60 +60 @@
 end
 
-if any(step==4) %High surface mass balance #3
+if any(steps==4) %High surface mass balance #3
         %Load model
 

issm/trunk-jpl/jenkins/jenkins.sh

@@ -356 +356 @@
                         then
                                 $SED -i.bak 's/steps=\[1\];/steps=\[1:5\];\n\ntry\n/' $FILE
-                        elif [ "${dir}" == "./IceFlowModels" ]; 
+                        elif [ "${dir}" == "./IceflowModels" ]; 
                         then
                                 # Almost nothing to this example
+                                $SED -i.bak '1 s/^.*$/try\n\n&/' $FILE
+                        elif [ "${dir}" == "./ISMIP" ]; 
+                        then
+                                # Eight steps... none of which are implmented in the script...
                                 $SED -i.bak '1 s/^.*$/try\n\n&/' $FILE
                         elif [ "${dir}" == "./Inversion" ];     
@@ -388 +392 @@
                         then
                                 $SED -i.bak 's/steps=\[1\];/steps=\[1:7\];\n\ntry\n/' $FILE
+                        elif [ "${dir}" == "./Data" ];  
+                        then
+                                echo "Data directory is used by examples. No modifications required."
                         else
                                 echo "Not implemented yet!"