Changeset 16555

Timestamp:

10/28/13 11:27:31 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• examples/Jakobshavn/Jks.par (modified) (1 diff)
• examples/Jakobshavn/runme.m (modified) (3 diffs)
• examples/SquareIceShelf/runme.m (modified) (1 diff)

issm/trunk-jpl/examples/Jakobshavn/Jks.par

@@ -57 +57 @@
 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);

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

@@ -42 +42 @@
         md=loadmodel('JksPar.mdl');
 
-        md=setflowequation(md,'macayeal','all');
+        md=setflowequation(md,'SSA','all');
 
         %Control general
@@ -64 +64 @@
 
         %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
@@ -83 +81 @@
                 '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');

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

@@ -3 +3 @@
 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);