Changeset 1838 for issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

Timestamp:

08/24/09 17:55:52 (16 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

File:

• issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp (modified) (25 diffs)

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -12 +12 @@
 #include "../shared/shared.h"
 #include "../MeshPartitionx/MeshPartitionx.h"
-#include "./Model.h"
-
-void CreateParameters(DataSet** pparameters,Model* model,ConstDataHandle model_handle){
+#include "./IoModel.h"
+
+void CreateParameters(DataSet** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){
         
         int i;
@@ -31 +31 @@
         count++;
         param= new Param(count,"analysis_type",INTEGER);
-        param->SetInteger(model->analysis_type);
+        param->SetInteger(iomodel->analysis_type);
         parameters->AddObject(param);
 
         count++;
         param= new Param(count,"sub_analysis_type",INTEGER);
-        param->SetInteger(model->sub_analysis_type);
+        param->SetInteger(iomodel->sub_analysis_type);
         parameters->AddObject(param);
 
         //dimension 2d or 3d:
-        if (strcmp(model->meshtype,"2d")==0)dim=2;
+        if (strcmp(iomodel->meshtype,"2d")==0)dim=2;
         else dim=3;
 
@@ -51 +51 @@
         count++;
         param= new Param(count,"ishutter",INTEGER);
-        param->SetInteger(model->ishutter);
+        param->SetInteger(iomodel->ishutter);
         parameters->AddObject(param);
 
         count++;
         param= new Param(count,"ismacayealpattyn",INTEGER);
-        param->SetInteger(model->ismacayealpattyn);
+        param->SetInteger(iomodel->ismacayealpattyn);
         parameters->AddObject(param);
 
@@ -62 +62 @@
         count++;
         param= new Param(count,"isstokes",INTEGER);
-        param->SetInteger(model->isstokes);
+        param->SetInteger(iomodel->isstokes);
+        parameters->AddObject(param);
+
+        //control: thermal static
+        count++;
+        param= new Param(count,"thermalstatic",INTEGER);
+        param->SetInteger(iomodel->thermalstatic);
         parameters->AddObject(param);
 
         /*debug: */
         param= new Param(count,"debug",INTEGER);
-        param->SetInteger(model->debug);
+        param->SetInteger(iomodel->debug);
         parameters->AddObject(param);
 
@@ -73 +79 @@
         count++;
         param= new Param(count,"eps_res",DOUBLE);
-        param->SetDouble(model->eps_res);
+        param->SetDouble(iomodel->eps_res);
         parameters->AddObject(param);
 
@@ -79 +85 @@
         count++;
         param= new Param(count,"eps_rel",DOUBLE);
-        param->SetDouble(model->eps_rel);
+        param->SetDouble(iomodel->eps_rel);
         parameters->AddObject(param);
 
@@ -85 +91 @@
         count++;
         param= new Param(count,"eps_abs",DOUBLE);
-        param->SetDouble(model->eps_abs);
+        param->SetDouble(iomodel->eps_abs);
         parameters->AddObject(param);
 
@@ -91 +97 @@
         count++;
         param= new Param(count,"yts",DOUBLE);
-        param->SetDouble(model->yts);
+        param->SetDouble(iomodel->yts);
         parameters->AddObject(param);
 
@@ -97 +103 @@
         count++;
         param= new Param(count,"dt",DOUBLE);
-        param->SetDouble(model->dt);
+        param->SetDouble(iomodel->dt);
         parameters->AddObject(param);
 
@@ -103 +109 @@
         count++;
         param= new Param(count,"ndt",DOUBLE);
-        param->SetDouble(model->ndt);
+        param->SetDouble(iomodel->ndt);
         parameters->AddObject(param);
 
@@ -109 +115 @@
         count++;
         param= new Param(count,"penalty_offset",DOUBLE);
-        param->SetDouble(model->penalty_offset);
+        param->SetDouble(iomodel->penalty_offset);
         parameters->AddObject(param);
 
@@ -115 +121 @@
         count++;
         param= new Param(count,"sparsity",DOUBLE);
-        param->SetDouble(model->sparsity);
+        param->SetDouble(iomodel->sparsity);
         parameters->AddObject(param);
 
@@ -121 +127 @@
         count++;
         param= new Param(count,"lowmem",INTEGER);
-        param->SetInteger(model->lowmem);
+        param->SetInteger(iomodel->lowmem);
         parameters->AddObject(param);
 
@@ -127 +133 @@
         count++;
         param= new Param(count,"connectivity",INTEGER);
-        param->SetInteger(model->connectivity);
+        param->SetInteger(iomodel->connectivity);
         parameters->AddObject(param);
 
@@ -133 +139 @@
         count++;
         param= new Param(count,"beta",DOUBLE);
-        param->SetDouble(model->beta);
+        param->SetDouble(iomodel->beta);
         parameters->AddObject(param);
 
@@ -139 +145 @@
         count++;
         param= new Param(count,"meltingpoint",DOUBLE);
-        param->SetDouble(model->meltingpoint);
+        param->SetDouble(iomodel->meltingpoint);
         parameters->AddObject(param);
 
@@ -145 +151 @@
         count++;
         param= new Param(count,"latentheat",DOUBLE);
-        param->SetDouble(model->latentheat);
+        param->SetDouble(iomodel->latentheat);
         parameters->AddObject(param);
 
@@ -151 +157 @@
         count++;
         param= new Param(count,"heatcapacity",DOUBLE);
-        param->SetDouble(model->heatcapacity);
+        param->SetDouble(iomodel->heatcapacity);
         parameters->AddObject(param);
 
@@ -157 +163 @@
         count++;
         param= new Param(count,"penalty_melting",DOUBLE);
-        param->SetDouble(model->penalty_melting);
+        param->SetDouble(iomodel->penalty_melting);
         parameters->AddObject(param);
 
@@ -163 +169 @@
         count++;
         param= new Param(count,"min_thermal_constraints",INTEGER);
-        param->SetInteger(model->min_thermal_constraints);
+        param->SetInteger(iomodel->min_thermal_constraints);
         parameters->AddObject(param);
 
@@ -169 +175 @@
         count++;
         param= new Param(count,"stokesreconditioning",DOUBLE);
-        param->SetDouble(model->stokesreconditioning);
+        param->SetDouble(iomodel->stokesreconditioning);
         parameters->AddObject(param);
 
@@ -175 +181 @@
         count++;
         param= new Param(count,"waitonlock",INTEGER);
-        param->SetInteger(model->waitonlock);
+        param->SetInteger(iomodel->waitonlock);
         parameters->AddObject(param);
 
@@ -181 +187 @@
         count++;
         param= new Param(count,"solverstring",STRING);
-        param->SetString(model->solverstring);
+        param->SetString(iomodel->solverstring);
         parameters->AddObject(param);
 
@@ -187 +193 @@
         count++;
         param= new Param(count,"plot",INTEGER);
-        param->SetInteger(model->plot);
+        param->SetInteger(iomodel->plot);
         parameters->AddObject(param);
 
@@ -193 +199 @@
         count++;
         param= new Param(count,"numberofnodes",INTEGER);
-        param->SetInteger(model->numberofnodes);
+        param->SetInteger(iomodel->numberofnodes);
         parameters->AddObject(param);
 
         /*Deal with numberofdofspernode: */
-        DistributeNumDofs(&numberofdofspernode,model->analysis_type,model->sub_analysis_type);
+        DistributeNumDofs(&numberofdofspernode,iomodel->analysis_type,iomodel->sub_analysis_type);
 
         count++;
         param= new Param(count,"numberofdofspernode",INTEGER);
         param->SetInteger(numberofdofspernode);
-        parameters->AddObject(param);
-
+        parameters->AddObject(param)
+                ;
         /*numrifts: */
         ModelFetchData((void**)&model->riftinfo,&model->numrifts,NULL,model_handle,"riftinfo","Matrix","Mat");