Changeset 20702

Timestamp:

06/06/16 15:42:12 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not weaken margins twice, and do not use mdl extensions for saved models

File:

• issm/trunk-jpl/examples/Jakobshavn/runme.m (modified) (2 diffs)

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

@@ -22 +22 @@
         [md.mesh.lat,md.mesh.long]  = xy2ll(md.mesh.x,md.mesh.y,+1,39,71);
         
-        save JksMesh.mdl md
+        save JksMesh md
 end 
 if any(steps==2)
         disp('  Step 2: Parameterization');
-        md=loadmodel('JksMesh.mdl');
+        md=loadmodel('JksMesh');
         
         md=setmask(md,'','');
         md=parameterize(md,'Jks.par'); 
 
-        %zones of shear margin softening
-        weakb=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,'WeakB.exp','node',2);
-        pos=find(weakb);
-        md.materials.rheology_B(pos)=.3*md.materials.rheology_B(pos);
-
-        save JksPar.mdl md
+        save JksPar md
 end 
 if any(steps==3)
         disp('  Step 3: Control method friction');
-        md=loadmodel('JksPar.mdl');
+        md=loadmodel('JksPar');
 
         md=setflowequation(md,'SSA','all');
@@ -72 +67 @@
         md=solve(md,StressbalanceSolutionEnum);
         
-        save JksControl.mdl md
+        save JksControl md
 end 
 if any(steps==4)
         disp('  Plotting')
-        md=loadmodel('JksControl.mdl');
+        md=loadmodel('JksControl');
 
         plotmodel(md,'unit#all','km','axis#all','equal',...