Changeset 9594

Timestamp:

09/02/11 16:10:21 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed problem with control: CorePointer needs to be revised

Location:

issm/trunk/src

Files:

• c/solutions/CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• c/solutions/issm.cpp (modified) (3 diffs)
• m/solutions/CorePointerFromSolutionEnum.m (modified) (2 diffs)
• m/solutions/control_core.m (modified) (1 diff)
• m/solutions/issm.m (modified) (1 diff)

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

@@ -71 +71 @@
         }
         
-        /*if control is being run on top of a solution, change core: */
-        if(control_analysis){
-                #ifdef _HAVE_TAO_
-                //solutioncore=&controltao_core;
-                solutioncore=&control_core;
-                #else
-                solutioncore=&control_core;
-                #endif
-        }       
-                
-        if(dakota_analysis){
-                #ifndef _HAVE_DAKOTA_ 
-                _error_(" Dakota not present, cannot do qmu!");
-                #endif
-        }
-
         /*Assign output pointer:*/
         _assert_(psolutioncore);

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

@@ -15 +15 @@
         FILE *petscoptionsfid  = NULL;
         bool  waitonlock       = false;
-        bool  dakota_analysis  = false;
+        bool  dakota_analysis;
+        bool  control_analysis; 
 
         /*FemModel: */
@@ -87 +88 @@
         femmodel->parameters->FindParam(&waitonlock,WaitonlockEnum);
         femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
+        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
 
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();
@@ -94 +96 @@
         _printf_(true,"call computational core:\n");
         MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-        if(dakota_analysis) Dakotax(femmodel);
-        else                solutioncore(femmodel);
+        if(dakota_analysis){
+                Dakotax(femmodel);
+        }
+        else if(control_analysis){
+                #ifdef _HAVE_TAO_
+                //controltao_core(femmodel);
+                control_core(femmodel);
+                #else
+                control_core(femmodel);
+                #endif
+        }
+        else{
+                solutioncore(femmodel);
+        }
         MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
 

issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m

@@ -4 +4 @@
 %   Usage:
 %      [solutioncore]=CorePointerFromSolutionEnum(parameters,solutiontype);
-
-control_analysis=parameters.ControlAnalysis;
-dakota_analysis=parameters.DakotaAnalysis;
 
 switch solutiontype,
@@ -25 +22 @@
 
 end
-
-%if control being run on top of solution, change core
-if(control_analysis)solutioncore='control_core';end

issm/trunk/src/m/solutions/control_core.m

@@ -28 +28 @@
 
         %Get core from solution type
-        solutioncore=CorePointerFromSolutionEnum(solution_type);
+        solutioncore=CorePointerFromSolutionEnum(femmodel.parameters,solution_type);
         adjointcore=AdjointCorePointerFromSolutionEnum(solution_type);
 

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

@@ -23 +23 @@
         %retrieve parameters
         dakota_analysis=femmodel.parameters.DakotaAnalysis;
+        control_analysis=femmodel.parameters.ControlAnalysis;
 
         %compute solution
-
         issmprintf(VerboseSolution,'%s',['call computational core']);
         if dakota_analysis,
                 Dakota(femmodel);
+        elseif control_analysis
+                femmodel=control_core(femmodel);
         else
                 eval(['femmodel=' solutioncore '(femmodel);']);