Changeset 945

Timestamp:

06/12/09 11:12:42 (16 years ago)

Author:

seroussi

Message:

fixed problem with termal for cielo

Location:

issm/trunk/src/c/objects

Files:

• Matice.cpp (modified) (1 diff)
• Penta.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Matice.cpp

@@ -375 +375 @@
                 }
         }
+
         #ifdef _DEBUG_
         _printf_("Viscosity %lf\n",viscosity3d);

issm/trunk/src/c/objects/Penta.cpp

@@ -1102 +1102 @@
         //Update material if necessary
         if(inputs->Recover("temperature_average",&temperature_list[0],1,dofs,6,(void**)nodes)){
+                if(matice){
+                        temperature_average=(temperature_list[0]+temperature_list[1]+temperature_list[2]+temperature_list[3]+temperature_list[4]+temperature_list[5])/6.0;
+                        B_average=Paterson(temperature_average);
+                        matice->SetB(B_average);
+                }
+        }
+        if(inputs->Recover("temperature",&temperature_list[0],1,dofs,6,(void**)nodes)){
                 if(matice){
                         temperature_average=(temperature_list[0]+temperature_list[1]+temperature_list[2]+temperature_list[3]+temperature_list[4]+temperature_list[5])/6.0;
@@ -3755 +3762 @@
         if(onbed && shelf){
 
-
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
                 tria->CreatePVectorThermalShelf(pg,inputs, analysis_type,sub_analysis_type);