Changeset 1834 for issm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp

Timestamp:

08/24/09 17:53:59 (15 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

File:

• issm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp (modified) (4 diffs)

issm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp

@@ -11 +11 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../Model.h"
+#include "../IoModel.h"
 
-void CreateParametersThermal(DataSet** pparameters,Model* model,ConstDataHandle model_handle){
+void CreateParametersThermal(DataSet** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){
         
         Param*   param = NULL;
@@ -33 +33 @@
 
         /*Get vx vy and vz: */
-        ModelFetchData((void**)&vx,NULL,NULL,model_handle,"vx","Matrix","Mat");
-        ModelFetchData((void**)&vy,NULL,NULL,model_handle,"vy","Matrix","Mat");
-        ModelFetchData((void**)&vz,NULL,NULL,model_handle,"vz","Matrix","Mat");
+        IoModelFetchData((void**)&vx,NULL,NULL,iomodel_handle,"vx","Matrix","Mat");
+        IoModelFetchData((void**)&vy,NULL,NULL,iomodel_handle,"vy","Matrix","Mat");
+        IoModelFetchData((void**)&vz,NULL,NULL,iomodel_handle,"vz","Matrix","Mat");
 
-        u_g=(double*)xcalloc(model->numberofnodes*3,sizeof(double));
+        u_g=(double*)xcalloc(iomodel->numberofnodes*3,sizeof(double));
 
-        if(vx) for(i=0;i<model->numberofnodes;i++)u_g[3*i+0]=vx[i]/model->yts;
-        if(vy) for(i=0;i<model->numberofnodes;i++)u_g[3*i+1]=vy[i]/model->yts;
-        if(vz) for(i=0;i<model->numberofnodes;i++)u_g[3*i+2]=vz[i]/model->yts;
+        if(vx) for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+0]=vx[i]/iomodel->yts;
+        if(vy) for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+1]=vy[i]/iomodel->yts;
+        if(vz) for(i=0;i<iomodel->numberofnodes;i++)u_g[3*i+2]=vz[i]/iomodel->yts;
 
         count++;
         param= new Param(count,"u_g",DOUBLEVEC);
-        param->SetDoubleVec(u_g,3*model->numberofnodes,3);
+        param->SetDoubleVec(u_g,3*iomodel->numberofnodes,3);
         parameters->AddObject(param);
 
@@ -54 +54 @@
         
         /*Get pressure: */
-        ModelFetchData((void**)&pressure,NULL,NULL,model_handle,"pressure","Matrix","Mat");
+        IoModelFetchData((void**)&pressure,NULL,NULL,iomodel_handle,"pressure","Matrix","Mat");
         
         count++;
         param= new Param(count,"p_g",DOUBLEVEC);
-        if(pressure) param->SetDoubleVec(pressure,model->numberofnodes,1);
+        if(pressure) param->SetDoubleVec(pressure,iomodel->numberofnodes,1);
         else param->SetDoubleVec(pressure,0,0);
         parameters->AddObject(param);
@@ -66 +66 @@
 
         /* get initial temperature and melting if transient*/
-        if(model->sub_analysis_type==TransientAnalysisEnum()){
+        if(iomodel->sub_analysis_type==TransientAnalysisEnum()){
 
                 /*Get melting and temperature: */
-                ModelFetchData((void**)&temperature,NULL,NULL,model_handle,"temperature","Matrix","Mat");
+                IoModelFetchData((void**)&temperature,NULL,NULL,iomodel_handle,"temperature","Matrix","Mat");
 
                 count++;
                 param= new Param(count,"t_g",DOUBLEVEC);
-                if(temperature) param->SetDoubleVec(temperature,model->numberofnodes,1);
+                if(temperature) param->SetDoubleVec(temperature,iomodel->numberofnodes,1);
                 else throw ErrorException(__FUNCT__,exprintf("Missing initial temperature"));
                 parameters->AddObject(param);