Changeset 5462

Timestamp:

08/20/10 16:24:05 (15 years ago)

Author:

Mathieu Morlighem

Message:

Got rid of Stokes control init

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• solutions/control_core.cpp (modified) (3 diffs)
• solutions/solutions.h (modified) (1 diff)
• solutions/stokescontrolinit.cpp (deleted)

issm/trunk/src/c/Makefile.am

@@ -1108 +1108 @@
                                         ./solutions/WriteLockFile.cpp\
                                         ./solutions/control_core.cpp\
-                                        ./solutions/stokescontrolinit.cpp\
                                         ./solutions/controlrestart.cpp\
                                         ./solutions/controlconvergence.cpp\

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

@@ -25 +25 @@
         int     dim;
         int     solution_type;
+        bool    isstokes;
 
         double* responses=NULL;
@@ -56 +57 @@
         femmodel->parameters->FindParam(&dim,DimEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        femmodel->parameters->FindParam(&isstokes,IsStokesEnum);
         /*}}}*/
 
@@ -62 +64 @@
         AdjointCorePointerFromSolutionEnum(&adjointcore,solution_type);
 
-        /*some preliminary work to be done if running full-Stokes analysis: */
-//      if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){
-//              stokescontrolinit(femmodel);
-//      }
+        /*Launch once a complete solution to set up all inputs*/
+        _printf_("%s\n","      preparing initial solution");
+        if (isstokes) solutioncore(femmodel);
 
         /*Initialize responses: */

issm/trunk/src/c/solutions/solutions.h

@@ -43 +43 @@
 //diverse
 void WriteLockFile(char* filename);
-void stokescontrolinit(FemModel* femmodel);
 void controlrestart(FemModel* femmodel,double* J);
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);