Changeset 15897

Timestamp:

08/23/13 09:00:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed compilation

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Penta.cpp (modified) (3 diffs)
• classes/Elements/Penta.h (modified) (1 diff)
• shared/Elements/elements.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -5281 +5281 @@
         for(int iv=0;iv<3;iv++){
                 gauss->GaussVertex(iv);
-                gaussup->GaussNode(iv+3);
+                gaussup->GaussVertex(iv+3);
 
         // TODO: make sure that no node is computed twice (insert mask)
@@ -5350 +5350 @@
     /*Intermediaries*/
     bool isenthalpy;
-    IssmDouble waterfraction_array[NUMVERTICES], temperature[NUMVERTICES];
+    IssmDouble waterfraction[NUMVERTICES], temperature[NUMVERTICES];
     IssmDouble enthalpy[NUMVERTICES], pressure[NUMVERTICES]; 
     IssmDouble latentheat, dt;
@@ -5371 +5371 @@
         enthalpy_input->GetInputValue(&enthalpy[iv], gauss);
         pressure_input->GetInputValue(&pressure[iv], gauss);
-        matpar->EnthalpyToThermal(&temperature[iv], &waterfraction[iv], enthalpy[iv],pressure[iv]); 
+        matpar->EnthalpyToThermal(&temperature[iv],&waterfraction[iv], enthalpy[iv],pressure[iv]); 
     
         /*drain water fraction*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -359 +359 @@
                 void           UpdateThermalBasalConstraints(void);
                 void           ComputeBasalMeltrate(void);
-        void           DrainWaterfraction(void);
+                void           DrainWaterfraction(void);
                 #endif
 

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -19 +19 @@
                                      IssmDouble* PrecipitationsPresentday,
                                      IssmDouble* TemperaturesLgm, IssmDouble* TemperaturesPresentday, 
-                                             IssmDouble* monthlytemperaturesout, IssmDouble* monthlyprecout);
+                                          IssmDouble* monthlytemperaturesout, IssmDouble* monthlyprecout);
 IssmDouble DrainageFunctionWaterfraction(IssmDouble waterfraction);