Changeset 26744 for issm/trunk/examples/shakti/runme.m

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• examples/shakti/runme.m (modified) (5 diffs)

issm/trunk/examples/shakti/runme.m

@@ -1 +1 @@
 steps=[1:3];
 
-if any(steps==1)
+if any(steps==1) 
         disp('  Step 1: Mesh');
 
@@ -8 +8 @@
 
         save MoulinMesh md
-end
-if any(steps==2)
+end 
+
+if any(steps==2) 
         disp('  Step 2: Parameterization');
         md=loadmodel('MoulinMesh');
@@ -21 +22 @@
         % Change hydrology class to Sommers' SHaKTI model
         md.hydrology=hydrologyshakti();
-        
+
         % Define initial water head such that water pressure is 50% of ice overburden pressure
         md.hydrology.head = 0.5*md.materials.rho_ice/md.materials.rho_freshwater*md.geometry.thickness + md.geometry.base;
@@ -48 +49 @@
 
         save MoulinParam md;
-end
-if any(steps==3);
+end 
+
+if any(steps==3) 
         disp('  Step 3: Solve!');
         md=loadmodel('MoulinParam');
@@ -80 +82 @@
 
         save MoulinTransient md
-end
+end