Changeset 9356 for issm/trunk/src/c/modules/ModelProcessorx/Enthalpy

Timestamp:

08/19/11 18:04:03 (14 years ago)

Author:

Eric.Larour

Message:

Major rewrite of the code so that IoModel now has a parameters dataset, which gets
loaded with all the int,char and double objects in the input file.
This is a lot more flexible, as anyone can add a field to the model, and it will
automatically appear in the IoModel parameters dataset.

Not debugged with respect to nightly runs yet. Trying to get the whole change finished.

Location:

issm/trunk/src/c/modules/ModelProcessorx/Enthalpy

Files:

• CreateConstraintsEnthalpy.cpp (modified) (4 diffs)
• CreateNodesEnthalpy.cpp (modified) (2 diffs)
• UpdateElementsEnthalpy.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp

@@ -16 +16 @@
         int i;
         int count;
+        int    dim;
+        int    numberofvertices;
+        double heatcapacity;
+        double referencetemperature;
         
         /*Output*/
         Constraints* constraints = NULL;
         SpcStatic*    spcstatic  = NULL;
+
+        /*Fetch parameters: */
+        iomodel->parameters->FindParam(&dim,DimEnum);
+        iomodel->parameters->FindParam(&numberofvertices,NumberOfVerticesEnum);
+        iomodel->parameters->FindParam(&heatcapacity,HeatcapacityEnum);
+        iomodel->parameters->FindParam(&referencetemperature,ReferencetemperatureEnum);
 
         /*Recover pointer: */
@@ -28 +38 @@
 
         /*return if 2d mesh*/
-        if (iomodel->dim==2) goto cleanup_and_return;
+        if (dim==2) goto cleanup_and_return;
 
         /*Fetch data: */
@@ -37 +47 @@
 
         /*Create constraints from x,y,z: */
-        for (i=0;i<iomodel->numberofvertices;i++){
+        for (i=0;i<numberofvertices;i++){
                 /*keep only this partition's nodes:*/
                 if((iomodel->my_vertices[i])){
@@ -43 +53 @@
                         if ((int)iomodel->spctemperature[2*i]){
 
-                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,iomodel->heatcapacity*(iomodel->spctemperature[2*i+1]-iomodel->referencetemperature),EnthalpyAnalysisEnum));
+                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,heatcapacity*(iomodel->spctemperature[2*i+1]-referencetemperature),EnthalpyAnalysisEnum));
                                 count++;
 

issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp

@@ -18 +18 @@
         int i;
         bool continuous_galerkin=true;
+        int    numberofvertices;
 
         /*DataSets: */
         Nodes*    nodes = NULL;
+
+        /*Fetch parameters: */
+        iomodel->parameters->FindParam(&numberofvertices,NumberOfVerticesEnum);
         
         /*Recover pointer: */
@@ -39 +43 @@
         iomodel->FetchData(&iomodel->nodeonwater,NULL,NULL,NodeOnWaterEnum);
 
-        for (i=0;i<iomodel->numberofvertices;i++){
+        for (i=0;i<numberofvertices;i++){
 
                 if(iomodel->my_vertices[i]){

issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp

@@ -16 +16 @@
 void    UpdateElementsEnthalpy(Elements* elements, IoModel* iomodel,int analysis_counter,int analysis_type){
 
+        int    dim;
+        int    numberofelements;
+
+        /*Fetch parameters: */
+        iomodel->parameters->FindParam(&dim,DimEnum);
+        iomodel->parameters->FindParam(&numberofelements,NumberOfElementsEnum);
+
         /*Now, is the model 3d? otherwise, do nothing: */
-        if (iomodel->dim==2)return;
+        if (dim==2)return;
 
         /*Fetch data needed: */
@@ -24 +31 @@
         /*Update elements: */
         int counter=0;
-        for(int i=0;i<iomodel->numberofelements;i++){
+        for(int i=0;i<numberofelements;i++){
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);