Changeset 1861

Timestamp:

08/25/09 10:00:32 (16 years ago)

Author:

Mathieu Morlighem

Message:

moved thermalstatic to steadystate

Location:

issm/trunk/src/c/parallel

Files:

• objectivefunctionC.cpp (modified) (4 diffs)
• parallel.h (modified) (1 diff)
• steadystate.cpp (added)
• steadystate_core.cpp (added)
• thermalstatic.cpp (deleted)
• thermalstatic_core.cpp (deleted)

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

@@ -46 +46 @@
         int     numberofnodes;
                 
-        /*thermalstatic: */
-        int     thermalstatic=0;
+        /*steadystate: */
+        int     steadystate=0;
         int     isstokes=0;
-        DataSet* results_thermalstatic=NULL;
+        DataSet* results_steadystate=NULL;
         int dofs01[2]={0,1};
 
@@ -72 +72 @@
         femmodel->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
         femmodel->parameters->FindParam((void*)&numberofdofspernode,"numberofdofspernode");
-        femmodel->parameters->FindParam((void*)&thermalstatic,"thermalstatic");
+        femmodel->parameters->FindParam((void*)&steadystate,"steadystate");
         femmodel->parameters->FindParam((void*)&isstokes,"isstokes");
 
@@ -88 +88 @@
         inputs->Add(control_type,param_g_copy,1,numberofnodes);
 
-        if(!thermalstatic){
+        if(!steadystate){
                 //Run diagnostic with updated parameters.
                 diagnostic_core_nonlinear(&u_g,NULL,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
@@ -94 +94 @@
         }
         else{
-                //Run full thermalstatic solution with updated parameters.
-                results_thermalstatic=new DataSet(ResultsEnum());
-                thermalstatic_core(results_thermalstatic,model,inputs);
+                //Run full steadystate solution with updated parameters.
+                results_steadystate=new DataSet(ResultsEnum());
+                steadystate_core(results_steadystate,model,inputs);
                 
                 //get u_g 
-                results_thermalstatic->FindResult(&u_g,"u_g");
-                delete results_thermalstatic;
+                results_steadystate->FindResult(&u_g,"u_g");
+                delete results_steadystate;
 
                 //extract the correct number of dofs (3 or 4)

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

@@ -18 +18 @@
 void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);
 
-void thermalstatic_core(DataSet* results,Model* model, ParameterInputs* inputs);
+void steadystate_core(DataSet* results,Model* model, ParameterInputs* inputs);
 
 void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, DataSet* loads, FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type);