Changeset 3751 for issm/trunk/src/c/parallel/thermal_core.cpp

Timestamp:

05/15/10 19:36:18 (15 years ago)

Author:

Eric.Larour

Message:

Final build that compiles in serial and parallel model

File:

• issm/trunk/src/c/parallel/thermal_core.cpp (modified) (4 diffs)

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

@@ -10 +10 @@
 #include "../modules.h"
 
-void thermal_core(DataSet* results,Model* model, ParameterInputs* inputs){
+void thermal_core(DataSet* results,Model* model){
 
         extern int my_rank;
@@ -65 +65 @@
 
                 if(verbose)_printf_("computing temperatures:\n");
-                thermal_core_nonlinear(&t_g[0],&melting_offset,fem_t,inputs,ThermalAnalysisEnum,NoneAnalysisEnum);
-                inputs->Add("temperature",t_g[0],1,numberofnodes);
-                inputs->Add("melting_offset",melting_offset);
+                thermal_core_nonlinear(&t_g[0],&melting_offset,fem_t,ThermalAnalysisEnum,NoneAnalysisEnum);
+                model->UpdateInputsFromVector(t_g[0],TemperatureEnum,VertexEnum);
+                model->UpdateInputsFromConstant(melting_offset,MeltingOffsetEnum);
                 
                 if(verbose)_printf_("computing melting:\n");
-                diagnostic_core_linear(&m_g[0],fem_m,inputs,MeltingAnalysisEnum,NoneAnalysisEnum);
+                diagnostic_core_linear(&m_g[0],fem_m,MeltingAnalysisEnum,NoneAnalysisEnum);
         }
         else{
@@ -86 +86 @@
                 t_g[0]=SerialToVec(t_g_serial,numberofnodes);
                 xfree((void**)&t_g_serial);
-                fem_m->FindParam(&m_g_serial,NULL,NULL,MeltingEnum);
+                fem_m->FindParam(&m_g_serial,NULL,NULL,MeltingRateEnum);
                 m_g[0]=SerialToVec(m_g_serial,numberofnodes);
                 xfree((void**)&m_g_serial);
@@ -95 +95 @@
                         
                         if(verbose)_printf_("computing temperatures:\n");
-                        inputs->Add("temperature",t_g[i],1,numberofnodes);
-                        thermal_core_nonlinear(&t_g[i+1],&melting_offset,fem_t,inputs,ThermalAnalysisEnum,NoneAnalysisEnum);
+                        model->UpdateInputsFromVector(t_g[i],TemperatureEnum,VertexEnum);
+                        thermal_core_nonlinear(&t_g[i+1],&melting_offset,fem_t,ThermalAnalysisEnum,NoneAnalysisEnum);
                         
                         if(verbose)_printf_("computing melting:\n");
-                        inputs->Add("temperature",t_g[i+1],1,numberofnodes);
-                        inputs->Add("melting_offset",melting_offset);
-                        diagnostic_core_linear(&m_g[i+1],fem_m,inputs,MeltingAnalysisEnum,NoneAnalysisEnum);
+                        model->UpdateInputsFromVector(t_g[i+1],TemperatureEnum,VertexEnum);
+                        model->UpdateInputsFromConstant(melting_offset,MeltingOffsetEnum);
+                        diagnostic_core_linear(&m_g[i+1],fem_m,MeltingAnalysisEnum,NoneAnalysisEnum);
                 }
         }