Changeset 17345

Timestamp:

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

Author:

seroussi

Message:

BUG: fixed failure in weekly NR

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Penta.cpp (modified) (2 diffs)
• Inputs/PentaInput.cpp (modified) (3 diffs)
• Inputs/PentaInput.h (modified) (1 diff)

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*/

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

@@ -158 +158 @@
 
 /*Object functions*/
+/*FUNCTION PentaInput::GetInputValue(IssmDouble* pvalue){{{*/
+void PentaInput::GetInputValue(IssmDouble* pvalue){
+
+        if(this->element_type==P0Enum){
+                pvalue=&values[0];
+        }
+        else _error_("not implemented yet");
+}
+/*}}}*/
 /*FUNCTION PentaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/
 void PentaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){
@@ -332 +341 @@
 
         IssmDouble thickness;
+        IssmDouble value=0.;
 
         /*Check that input provided is a thickness*/
@@ -338 +348 @@
         /*vertically integrate depending on type:*/
         switch(this->element_type){
-                case P1Enum:{
+                case P1Enum: {
                         GaussPenta *gauss=new GaussPenta();
                         for(int iv=0;iv<3;iv++){

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h

@@ -47 +47 @@
                 void GetInputValue(bool* pvalue){_error_("not implemented yet");};
                 void GetInputValue(int* pvalue){_error_("not implemented yet");};
-                void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");};
+                void GetInputValue(IssmDouble* pvalue);
                 void GetInputValue(IssmDouble* pvalue,Gauss* gauss);
                 void GetInputValue(IssmDouble* pvalue,Gauss* gauss,IssmDouble time){_error_("not implemented yet");};