[issm-svn] r16454 - issm/trunk/examples

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2013-10-18 08:17:30 -0700 (Fri, 18 Oct 2013)
New Revision: 16454

Modified:
   issm/trunk/examples/Jakobshavn/Jks.par
   issm/trunk/examples/Jakobshavn/runme.m
   issm/trunk/examples/SquareIceShelf/Square.par
   issm/trunk/examples/SquareIceShelf/runme.m
Log:
BUG: fixed tutorials with new mask and solution names

Modified: issm/trunk/examples/Jakobshavn/Jks.par
===================================================================
--- issm/trunk/examples/Jakobshavn/Jks.par	2013-10-18 14:51:26 UTC (rev 16453)
+++ issm/trunk/examples/Jakobshavn/Jks.par	2013-10-18 15:17:30 UTC (rev 16454)
@@ -43,8 +43,7 @@
 
 disp('   Construct basal friction parameters');
 md.friction.coefficient=30*ones(md.mesh.numberofvertices,1);
-pos=find(md.mask.vertexonfloatingice);
-md.friction.coefficient(pos)=0; %no friction applied on floating ice
+md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
 
@@ -57,5 +56,4 @@
 
 disp('   Set other boundary conditions');
 md=SetMarineIceSheetBC(md,'./Front.exp');
-md.diagnostic.icefront(:,end)=1; %Apply water pressure at the ice front
 md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);

Modified: issm/trunk/examples/Jakobshavn/runme.m
===================================================================
--- issm/trunk/examples/Jakobshavn/runme.m	2013-10-18 14:51:26 UTC (rev 16453)
+++ issm/trunk/examples/Jakobshavn/runme.m	2013-10-18 15:17:30 UTC (rev 16454)
@@ -41,7 +41,7 @@
 	disp('	Step 3: Control method friction');
 	md=loadmodel('JksPar.mdl');
 
-	md=setflowequation(md,'macayeal','all');
+	md=setflowequation(md,'SSA','all');
 
 	%Control general
 	md.inversion.iscontrol=1;
@@ -63,15 +63,13 @@
 	md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1);
 
 	%Additional parameters
-	md.diagnostic.restol=0.01;
-	md.diagnostic.reltol=0.1;
-	md.diagnostic.abstol=NaN;
+	md.stressbalance.restol=0.01;
+	md.stressbalance.reltol=0.1;
+	md.stressbalance.abstol=NaN;
 
 	%Go solve
 	md.cluster=generic('name',oshostname,'np',4);
-	md.solver=addoptions(md.solver,NoneAnalysisEnum,asmoptions);
-	md.solver=addoptions(md.solver,DiagnosticVertAnalysisEnum,jacobiasmoptions);
-	md=solve(md,DiagnosticSolutionEnum);
+	md=solve(md,StressbalanceSolutionEnum);
 	
 	save JksControl.mdl md
 end 
@@ -82,11 +80,11 @@
 	plotmodel(md,'unit#all','km','axis#all','equal',...
 		'FontSize#all',12,...
 		'data',md.inversion.vel_obs,'title','Observed velocity',...
-		'data',md.results.DiagnosticSolution.Vel,'title','Modeled Velocity',...
+		'data',md.results.StressbalanceSolution.Vel,'title','Modeled Velocity',...
 		'colorbar#1','off','colorbar#2','on','colorbartitle#2','[m/yr]',...
 		'caxis#1-2',[0,7000],...
 		'data',md.geometry.bed,'title','Bed elevation',...
-		'data',md.results.DiagnosticSolution.FrictionCoefficient,...
+		'data',md.results.StressbalanceSolution.FrictionCoefficient,...
 		'title','Friction Coefficient',...
 		'colorbar#3','on','colorbartitle#3','[m]','colorbar#4','on');
 end

Modified: issm/trunk/examples/SquareIceShelf/Square.par
===================================================================
--- issm/trunk/examples/SquareIceShelf/Square.par	2013-10-18 14:51:26 UTC (rev 16453)
+++ issm/trunk/examples/SquareIceShelf/Square.par	2013-10-18 15:17:30 UTC (rev 16454)
@@ -10,9 +10,8 @@
 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
 
 disp('      creating drag');
-pos=find(md.mask.vertexonfloatingice);
 md.friction.coefficient=200*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(pos)=0;
+md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
 

Modified: issm/trunk/examples/SquareIceShelf/runme.m
===================================================================
--- issm/trunk/examples/SquareIceShelf/runme.m	2013-10-18 14:51:26 UTC (rev 16453)
+++ issm/trunk/examples/SquareIceShelf/runme.m	2013-10-18 15:17:30 UTC (rev 16454)
@@ -2,6 +2,6 @@
 md=triangle(md,'DomainOutline.exp',100000);
 md=setmask(md,'all','');
 md=parameterize(md,'Square.par');
-md=setflowequation(md,'macayeal','all');
+md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname,'np',2);
-md=solve(md,DiagnosticSolutionEnum);
+md=solve(md,StressbalanceSolutionEnum);