Changeset 5471

Timestamp:

08/23/10 00:23:27 (15 years ago)

Author:

Eric.Larour

Message:

issm: control_core now an official solution core.
control_core: reset parameters to where they were before, for use in qmu.

Location:

issm/trunk/src/c/solutions

Files:

• control_core.cpp (modified) (2 diffs)
• issm.cpp (modified) (1 diff)

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

@@ -114 +114 @@
 
         _printf_("%s\n","      preparing final solution");
-        femmodel->parameters->SetParam(false,ControlAnalysisEnum);
+        femmodel->parameters->SetParam(false,ControlAnalysisEnum); //needed to turn control result output in solutioncore
         solutioncore(femmodel);
 
@@ -130 +130 @@
         xfree((void**)&cm_jump);
         xfree((void**)&J);
+        
+        /*control_core might be used in Qmu, so leave everything similar to where it started: */
+        femmodel->parameters->SetParam(true,ControlAnalysisEnum);
 }

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

@@ -79 +79 @@
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();
 
+        /*if control is being run on top of a solution, change core: */
+        if(control_analysis)solutioncore=&control_core;
+
         /*are we running the solution sequence, or a qmu wrapper around it? : */
         if(!qmu_analysis){
-                if(!control_analysis){
                         
-                        _printf_("call computational core:\n");
-                        MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                        solutioncore(femmodel);
-                        MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
-
-                }
-                else{
-                        /*run control analysis: */
-                        _printf_("call computational core:\n");
-                        MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                        control_core(femmodel);
-                        MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
-
-                }
+                _printf_("call computational core:\n");
+                MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
+                solutioncore(femmodel);
+                MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
 
                 _printf_("write results to disk:\n");