Changeset 16746

Timestamp:

11/13/13 16:39:11 (11 years ago)

Author:

seroussi

Message:

CHG: fixing thermal and enthalpy

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (2 diffs)

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

@@ -4851 +4851 @@
         IssmDouble  values[numdof];
         IssmDouble  B[numdof],surface[numdof];
+        IssmDouble  B_average;
         int        *doflist = NULL;
         bool        hack    = false;
@@ -4969 +4970 @@
                                 break;
                         case PatersonEnum:
-                                for(i=0;i<numdof;i++) B[i]=Paterson(values[i]);
+                                for(i=0;i<numdof;i++) B[i]=Paterson(temperatures[i]);
                                 this->material->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum));
                                 break;
                         case ArrheniusEnum:
-                                for(i=0;i<numdof;i++) B[i]=Arrhenius(values[i],surface[i]-xyz_list[i][2],material->GetN());
+                                for(i=0;i<numdof;i++) B[i]=Arrhenius(temperatures[i],surface[i]-xyz_list[i][2],material->GetN());
                                 this->material->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum));
                                 break;