Changeset 2000

Timestamp:

08/27/09 08:54:15 (16 years ago)

Author:

seroussi

Message:

added control for steadystate paralle

Location:

issm/trunk/src/c/parallel

Files:

• control_core.cpp (modified) (2 diffs)
• gradjcompute_core.cpp (moved) (moved from issm/trunk/src/c/parallel/GradJCompute.cpp ) (8 diffs)
• parallel.h (modified) (1 diff)

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

@@ -21 +21 @@
         /*Intermediary: */
         DataSet* diagnostic_results=NULL;
+        DataSet* gradjcompute_results=NULL;
         Vec     u_g=NULL;
         double  search_scalar;
@@ -88 +89 @@
 
                 _printf_("%s\n","      computing gradJ...");
-                grad_g=GradJCompute(inputs,fem_model);
+                gradjcompute_results=new DataSet(ResultsEnum()); 
+                gradjcompute_core(gradjcompute_results,model, inputs);
+                gradjcompute_results->FindResult(&grad_g,"grad_g");
+                delete gradjcompute_results;
                 _printf_("%s\n","      done.");
 

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

@@ -1 @@
-/*!\file:  GradJCompute.cpp
+/*!\file:  gradjcompute_core.cpp
  * \brief compute inverse method gradient direction.
  */ 
@@ -7 +7 @@
 
 #undef __FUNCT__ 
-#define __FUNCT__ "GradJCompute"
+#define __FUNCT__ "gradjcompute_core"
 
 #ifdef HAVE_CONFIG_H
@@ -15 +15 @@
 #endif
 
-Vec GradJCompute(ParameterInputs* inputs,FemModel* femmodel){
+void gradjcompute_core(DataSet* results,Model* model, ParameterInputs* inputs){
         
         
         /*intermediary: */
+        FemModel* femmodel=NULL;
+        DataSet* diagnostic_results=NULL;
         int analysis_type;
         int sub_analysis_type;
@@ -31 +33 @@
         Vec du_g=NULL;
         Vec du_f=NULL;
+        Vec grad_g=NULL;
 
         Vec lambda_f=NULL;
@@ -40 +43 @@
         
         /*output: */
-        Vec grad_g=NULL;
+        Result* result=NULL;
 
         /*flags: */
@@ -48 +51 @@
         
         /*some parameters:*/
+        femmodel=model->GetActiveFormulation();
         femmodel->parameters->FindParam((void*)&analysis_type,"analysis_type");
         femmodel->parameters->FindParam((void*)&sub_analysis_type,"sub_analysis_type");
@@ -90 +94 @@
                 FieldExtrudex( grad_g, femmodel->elements,femmodel->nodes,femmodel->loads,femmodel->materials,"gradj",0);
         }
+
+        if(analysis_type==SteadystateAnalysisEnum()){
+                diagnostic_results=new DataSet(ResultsEnum()); 
+                diagnostic_core(diagnostic_results,model, inputs);
+
+                //extract u_g and add it to input (3d velocity needed by thermal_core)
+                diagnostic_results->FindResult(&u_g,"u_g");
+                inputs->Add("velocity",u_g,3,numberofnodes);
+                delete diagnostic_results;
+        }
+
+        /*Plug results into output dataset: */
+        result=new Result(results->Size()+1,0,1,"grad_g",grad_g);
+        results->AddObject(result);
         
         /*Free ressources:*/
@@ -95 +113 @@
         xfree((void**)&control_type);
         xfree((void**)&u_g_double);
+        xfree((void**)&grad_g);
         xfree((void**)&lambda_g_double);
 
-        return grad_g;
-
 }

issm/trunk/src/c/parallel/parallel.h

@@ -13 +13 @@
 class FemModel;
 
-Vec GradJCompute(ParameterInputs* inputs,FemModel* femmodel);
+void gradjcompute_core(DataSet* results,Model* model, ParameterInputs* inputs);
 
 void diagnostic_core(DataSet* results,Model* model, ParameterInputs* inputs);