Changeset 2234

Timestamp:

09/15/09 09:38:53 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed some bugs in control

Location:

issm/trunk/src/c/parallel

Files:

• control_core.cpp (modified) (2 diffs)
• diagnostic.cpp (modified) (2 diffs)
• steadystate.cpp (modified) (2 diffs)

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

@@ -205 +205 @@
         results->AddObject(result);
         if (control_steady){
-                result=new Result(results->Size()+1,0,1,"u_g",u_g);
-                results->AddObject(result);
                 result=new Result(results->Size()+1,0,1,"t_g",t_g);
                 results->AddObject(result);
@@ -224 +222 @@
         VecFree(&u_g);
         VecFree(&t_g);
+        VecFree(&m_g);
         xfree((void**)&J);
-
 }

issm/trunk/src/c/parallel/diagnostic.cpp

@@ -112 +112 @@
                         _printf_("call computational core:\n");
                         diagnostic_core(results,model,inputs);
-                }
-                else{
-                        /*run control analysis: */
-                        _printf_("call computational core:\n");
-                        control_core(results,model,inputs);
-                }
-                if(!control_analysis){
+
                         /*Add analysis_type to results: */
                         result=new Result(results->Size()+1,0,1,"analysis_type","diagnostic");
@@ -127 +121 @@
                 }
                 else{
+                        /*run control analysis: */
+                        _printf_("call computational core:\n");
+                        control_core(results,model,inputs);
+
                         /*Add analysis_type and control_type to results: */
                         result=new Result(results->Size()+1,0,1,"analysis_type","diagnostic");

issm/trunk/src/c/parallel/steadystate.cpp

@@ -123 +123 @@
                         _printf_("call computational core:\n");
                         steadystate_core(results,model,inputs);
+
+                        /*Add analysis_type to results: */
+                        result=new Result(results->Size()+1,0,1,"analysis_type","steadystate");
+                        results->AddObject(result);
+
+                        _printf_("process results:\n");
+                        ProcessResults(&processed_results,results,model,SteadystateAnalysisEnum());
                 }
                 else{
@@ -135 +142 @@
                         _printf_("call computational core:\n");
                         control_core(results,model,inputs);
-                }
 
-                if(!control_analysis){
-                        /*Add analysis_type to results: */
-                        result=new Result(results->Size()+1,0,1,"analysis_type","steadystate");
-                        results->AddObject(result);
-
-                        _printf_("process results:\n");
-                        ProcessResults(&processed_results,results,model,SteadystateAnalysisEnum());
-                }
-                else{
                         /*Add analysis_type and control_type to results: */
                         result=new Result(results->Size()+1,0,1,"analysis_type","steadystate");