Changeset 4296

Timestamp:

06/29/10 08:24:10 (15 years ago)

Author:

Mathieu Morlighem

Message:

use variable to call new FemModel (do not hardcore)

Location:

issm/trunk/src/m/solutions

Files:

• balancedthickness.m (modified) (1 diff)
• balancedthickness2.m (modified) (1 diff)
• balancedvelocities.m (modified) (1 diff)
• bedslope.m (modified) (1 diff)
• prognostic.m (modified) (1 diff)
• prognostic2.m (modified) (1 diff)
• steadystate.m (modified) (1 diff)
• surfaceslope.m (modified) (1 diff)
• thermal.m (modified) (1 diff)
• transient2d.m (modified) (1 diff)
• transient3d.m (modified) (1 diff)

issm/trunk/src/m/solutions/balancedthickness.m

@@ -13 +13 @@
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,1);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/balancedthickness2.m

@@ -13 +13 @@
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,1);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/balancedvelocities.m

@@ -13 +13 @@
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,1);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/bedslope.m

@@ -13 +13 @@
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,1);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/prognostic.m

@@ -14 +14 @@
         
         displaystring(md.verbose,'%s',['reading prognostic model data']);
-        femmodel=NewFemModel(md,solution_type,analyses,1);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         % figure out number of dof: just for information purposes.

issm/trunk/src/m/solutions/prognostic2.m

@@ -13 +13 @@
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,1);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/steadystate.m

@@ -9 +9 @@
         t1=clock;
 
-        numanalyses=1;
+        numanalyses=7;
         analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
         solution_type=SteadyStateSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,7);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/surfaceslope.m

@@ -13 +13 @@
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,1);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/thermal.m

@@ -8 +8 @@
         t1=clock;
         
-        numanalyses=1;
+        numanalyses=2;
         analyses=[ThermalAnalysisEnum;MeltingAnalysisEnum];
         solution_type=ThermalSolutionEnum;
 
         displaystring(md.verbose,'%s',['reading thermal model data']);
-        femmodel=NewFemModel(md,solution_type,analyses,2);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/transient2d.m

@@ -10 +10 @@
         t1=clock;
 
-        numanalyses=1;
+        numanalyses=2;
         analyses=[DiagnosticHorizAnalysisEnum;PrognosticAnalysisEnum];
         solution_type=Transient2DSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,2);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

issm/trunk/src/m/solutions/transient3d.m

@@ -14 +14 @@
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analyses,8);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters