Changeset 11391

Timestamp:

02/10/12 09:23:32 (13 years ago)

Author:

seroussi

Message:

minor cleaning

File:

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

issm/trunk-jpl/src/c/objects/Elements/Penta.cpp ¶

@@ -3733 +3733 @@
         this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
         this->parameters->FindParam(&stabilization,ThermalStabilizationEnum);
-        Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
-        Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
-        Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input);
-        Input* pressure_input=inputs->GetInput(PressureEnum);      _assert_(pressure_input);
-        Input* enthalpy_input=NULL;
-        if (dt) enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(inputs);
+        Input* vx_input=inputs->GetInput(VxEnum);                                  _assert_(vx_input);
+        Input* vy_input=inputs->GetInput(VyEnum);                                  _assert_(vy_input);
+        Input* vz_input=inputs->GetInput(VzEnum);                                  _assert_(vz_input);
+        Input* pressure_input=inputs->GetInput(PressureEnum);                      _assert_(pressure_input);
+        Input* enthalpy_input=NULL; enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input);
         if (stabilization==2) diameter=MinEdgeLength(xyz_list);
 
@@ -3752 +3751 @@
                 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input);
                 matice->GetViscosity3dStokes(&viscosity,&epsilon[0]);
+                enthalpy_input->GetInputValue(&enthalpy, gauss);
                 GetPhi(&phi, &epsilon[0], viscosity);
 
-                scalar_def=phi/(rho_ice)*Jdet*gauss->weight;
+                scalar_def=phi/rho_ice*Jdet*gauss->weight;
                 if(dt) scalar_def=scalar_def*dt;
 
@@ -3761 +3761 @@
                 /* Build transient now */
                 if(dt){
-                        enthalpy_input->GetInputValue(&enthalpy, gauss);
                         scalar_transient=enthalpy*Jdet*gauss->weight;
                         for(i=0;i<NUMVERTICES;i++)  pe->values[i]+=scalar_transient*L[i];
@@ -3774 +3773 @@
                         pressure_input->GetInputValue(&pressure, gauss);
                         kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure);
-
                         tau_parameter=GetStabilizationParameter(u,v,w,diameter,kappa);