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

Timestamp:

02/24/14 10:40:05 (11 years ago)

Author:

seroussi

Message:

BUG: fixed failure in weekly NR

File:

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

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

@@ -1292 +1292 @@
         IssmDouble  Helem_list[NUMVERTICES];
         IssmDouble  zeros_list[NUMVERTICES]={0.0};
+        IssmDouble  p0top1_list[NUMVERTICES];
         Penta* penta=NULL;
         Input* original_input=NULL;
@@ -1339 +1340 @@
 
                 /*Step3: Vertically integrate A COPY of the original*/
-                element_integrated_input=(Input*)original_input->copy();
-                element_integrated_input->VerticallyIntegrate(element_thickness_input);
+                if(original_input->ObjectEnum()==PentaInputEnum){
+                        if(((PentaInput*)original_input)->element_type==P0Enum){
+                                original_input->GetInputValue(&p0top1_list[i]);
+                                element_integrated_input= new  PentaInput(original_input->InstanceEnum(),p0top1_list,P1Enum);
+                                element_integrated_input->VerticallyIntegrate(element_thickness_input);
+                        }
+                        else{
+                                element_integrated_input= (Input*)original_input->copy();
+                                element_integrated_input->VerticallyIntegrate(element_thickness_input);
+                        }
+                }
+                else{
+                        element_integrated_input= (Input*)original_input->copy();
+                        element_integrated_input->VerticallyIntegrate(element_thickness_input);
+                }
 
                 /*Add contributions to global inputs*/