Changeset 991

Timestamp:

06/13/09 20:02:40 (16 years ago)

Author:

seroussi

Message:

compute ever B or Bbar depending if the element is collapse or not

File:

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

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

@@ -1102 +1102 @@
         //Update material if necessary
         if(inputs->Recover("temperature",&temperature_list[0],1,dofs,6,(void**)nodes)){
-                if(matice){
+                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);
@@ -1110 +1110 @@
         
         if(inputs->Recover("temperature_average",&temperature_list[0],1,dofs,6,(void**)nodes)){
-                if(matice){
+                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);