Changeset 1858

Timestamp:

08/25/09 09:23:50 (16 years ago)

Author:

seroussi

Message:

better way to compute B from temperature

File:

• issm/trunk/src/c/objects/Penta.cpp (modified) (2 diffs)

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

@@ -1119 +1119 @@
         if(inputs->Recover("temperature",&temperature_list[0],1,dofs,6,(void**)nodes)){
                 if(matice && !collapse){
-                        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);
+                        B_average=(Paterson(temperature_list[0])+Paterson(temperature_list[1])+Paterson(temperature_list[2])
+                                                +Paterson(temperature_list[3])+Paterson(temperature_list[4])+Paterson(temperature_list[5]))/6.0;
                         matice->SetB(B_average);
                 }
@@ -1127 +1127 @@
         if(inputs->Recover("temperature_average",&temperature_list[0],1,dofs,6,(void**)nodes)){
                 if(matice && collapse){
-                        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);
+                        B_average=(Paterson(temperature_list[0])+Paterson(temperature_list[1])+Paterson(temperature_list[2])
+                                                +Paterson(temperature_list[3])+Paterson(temperature_list[4])+Paterson(temperature_list[5]))/6.0;
                         matice->SetB(B_average);
                 }