Changeset 4294

Timestamp:

06/29/10 08:20:45 (15 years ago)

Author:

Mathieu Morlighem

Message:

Homogenized with parallel, added missing timing and fixed diagnostic

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)
• diagnostic.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) (2 diffs)

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

@@ -8 +8 @@
         t1=clock;
 
-        analysis_types=[BalancedThicknessAnalysisEnum];
-        solution_type=BalancedthicknessAnalysisEnum;
+        numanalyses=1;
+        analyses=[BalancedThicknessAnalysisEnum];
+        solution_type=BalancedthicknessSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analysis_types,1);
+        femmodel=NewFemModel(md,solution_type,analyses,1);
 
         %retrieve parameters

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

@@ -5 +5 @@
 %      md=balancedthickness2(md)
 
-        analysis_types=[Balancedthickness2AnalysisEnum];
-        solution_type=Balancedthickness2AnalysisEnum;
+        %timing
+        t1=clock;
+
+        numanalyses=1;
+        analyses=[Balancedthickness2AnalysisEnum];
+        solution_type=Balancedthickness2SolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analysis_types,1);
+        femmodel=NewFemModel(md,solution_type,analyses,1);
 
         %retrieve parameters

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

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

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

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

issm/trunk/src/m/solutions/diagnostic.m

@@ -8 +8 @@
         t1=clock;
 
-        analysis_types=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SlopeAnalysisEnum];
+        numanalyses=6;
+        analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;BedSlopeAnalysisEnum;SurfaceSlopeAnalysisEnum];
         solution_type=DiagnosticAnalysisEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analysis_types,5);
+        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
         %retrieve parameters

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

@@ -9 +9 @@
 
         %Build all models requested for diagnostic simulation
-        analysis_types=[PrognosticAnalysisEnum];
-        solution_type=PrognosticAnalysisEnum;
+        numanalyses=1;
+        analyses=[PrognosticAnalysisEnum];
+        solution_type=PrognosticSolutionEnum;
         
         displaystring(md.verbose,'%s',['reading prognostic model data']);
-        femmodel=NewFemModel(md,solution_type,analysis_types,1);
+        femmodel=NewFemModel(md,solution_type,analyses,1);
 
         % figure out number of dof: just for information purposes.

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

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

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

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

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

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

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

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

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

@@ -7 +7 @@
 %   See also: TRANSIENT3D, TRANSIENT
 
-        analysis_types=[DiagnosticHorizAnalysisEnum;PrognosticAnalysisEnum];
-        solution_type=Transient2DAnalysisEnum;
+        %timing
+        t1=clock;
+
+        numanalyses=1;
+        analyses=[DiagnosticHorizAnalysisEnum;PrognosticAnalysisEnum];
+        solution_type=Transient2DSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analysis_types,2);
+        femmodel=NewFemModel(md,solution_type,analyses,2);
 
         %retrieve parameters

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

@@ -6 +6 @@
 %   See also: TRANSIENT2D, TRANSIENT
 
-        analysis_types=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
-        solution_type=Transient3DAnalysisEnum;
+        %timing
+        t1=clock;
+
+        numanalyses=8;
+        analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+        solution_type=Transient3DSolutionEnum;
 
         displaystring(md.verbose,'%s',['create finite element model']);
-        femmodel=NewFemModel(md,solution_type,analysis_types,8);
+        femmodel=NewFemModel(md,solution_type,analyses,8);
 
         %retrieve parameters
@@ -20 +24 @@
                 displaystring(verbose,'%s',['call computational core']);
                 femmodel=transient3d_core(femmodel);
-                
+
                 displaystring(verbose,'%s',['write results']);
                 md.results.transient3d=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);