Changeset 16137 for issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ModelProcessorx (modified) (1 prop)
• src/c/modules/ModelProcessorx/Enthalpy (modified) (1 prop)
• src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (modified) (4 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

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

@@ -11 +11 @@
 void    UpdateElementsEnthalpy(Elements* elements, IoModel* iomodel,int analysis_counter,int analysis_type){
 
-        int    dim;
-        int    numberofelements;
-
-        /*Fetch parameters: */
-        iomodel->Constant(&dim,MeshDimensionEnum);
-        iomodel->Constant(&numberofelements,MeshNumberofelementsEnum);
-
         /*Now, is the model 3d? otherwise, do nothing: */
-        if(dim==2)return;
+        if(iomodel->dim==2)return;
 
         /*Fetch data needed: */
-        iomodel->FetchData(4,MeshElementsEnum,TemperatureEnum,WaterfractionEnum,PressureEnum);
+        iomodel->FetchData(3,TemperatureEnum,WaterfractionEnum,PressureEnum);
 
         /*Update elements: */
         int counter=0;
-        for(int i=0;i<numberofelements;i++){
+        for(int i=0;i<iomodel->numberofelements;i++){
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
-                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        element->Update(i,iomodel,analysis_counter,analysis_type,P1Enum);
                         counter++;
                 }
@@ -40 +33 @@
         iomodel->FetchDataToInput(elements,FrictionPEnum);
         iomodel->FetchDataToInput(elements,FrictionQEnum);
-        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
+        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
+        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
         iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
         iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
-        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
         iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum);
         iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
@@ -51 +44 @@
         iomodel->FetchDataToInput(elements,WaterfractionEnum);
         iomodel->FetchDataToInput(elements,BasalforcingsGeothermalfluxEnum);
+        iomodel->FetchDataToInput(elements,WatercolumnEnum);
+        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
         iomodel->FetchDataToInput(elements,VxEnum);
         iomodel->FetchDataToInput(elements,VyEnum);
@@ -56 +51 @@
 
         /*Free data: */
-        iomodel->DeleteData(4,MeshElementsEnum,TemperatureEnum,WaterfractionEnum,PressureEnum);
+        iomodel->DeleteData(3,TemperatureEnum,WaterfractionEnum,PressureEnum);
 }

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp