Changeset 5247 for issm/trunk/src/c/solutions/SolutionConfiguration.cpp

Timestamp:

08/13/10 11:05:48 (15 years ago)

Author:

Mathieu Morlighem

Message:

control_methods are more general now

File:

• issm/trunk/src/c/solutions/SolutionConfiguration.cpp (modified) (12 diffs)

issm/trunk/src/c/solutions/SolutionConfiguration.cpp

@@ -26 +26 @@
         void (*solutioncore)(FemModel*)=NULL;
 
+        /*Get Core pointer*/
+        CorePointerFromSolutionEnum(&solutioncore,solutiontype);
+
+        /*Analyses lists*/
         switch(solutiontype){
         
@@ -37 +41 @@
                         analyses[4]=SurfaceSlopeAnalysisEnum;
                         analyses[5]=BedSlopeAnalysisEnum;
-                        solutioncore=&diagnostic_core;
                         break;
 
@@ -51 +54 @@
                         analyses[6]=ThermalAnalysisEnum;
                         analyses[7]=MeltingAnalysisEnum;
-                        solutioncore=&steadystate_core;
                         break;
 
@@ -59 +61 @@
                         analyses[0]=ThermalAnalysisEnum;
                         analyses[1]=MeltingAnalysisEnum;
-                        solutioncore=&thermal_core;
                         break;
 
@@ -66 +67 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=PrognosticAnalysisEnum;
-                        solutioncore=&prognostic_core;
                         break;
 
@@ -73 +73 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=BalancedthicknessAnalysisEnum;
-                        solutioncore=&balancedthickness_core;
                         break;
 
@@ -80 +79 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=BalancedvelocitiesAnalysisEnum;
-                        solutioncore=&balancedvelocities_core;
                         break;
 
@@ -87 +85 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=SurfaceSlopeAnalysisEnum;
-                        solutioncore=&surfaceslope_core;
                         break;
 
@@ -94 +91 @@
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=BedSlopeAnalysisEnum;
-                        solutioncore=&bedslope_core;
                         break;
 
@@ -107 +103 @@
                         analyses[5]=BedSlopeAnalysisEnum;
                         analyses[6]=PrognosticAnalysisEnum;
-                        solutioncore=&transient2d_core;
                         break;
                 
@@ -122 +117 @@
                         analyses[7]=ThermalAnalysisEnum;
                         analyses[8]=MeltingAnalysisEnum;
-                        solutioncore=&transient3d_core;
                         break;
 
@@ -132 +126 @@
         /*Assign output pointers:*/
         if(pnumanalyses) *pnumanalyses=numanalyses;
-        if(panalyses)*panalyses=analyses;
-        else xfree((void**)&analyses);
+        if(panalyses)    *panalyses=analyses;
+        else              xfree((void**)&analyses);
         if(psolutioncore)*psolutioncore=solutioncore;