Changeset 17605

Timestamp:

03/31/14 14:41:15 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing depth averaging for non P1 input

File:

• issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (modified) (1 diff)

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

@@ -335 +335 @@
         if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
 
-        /*vertically integrate depending on type:*/
+        /*vertically integrate depending on type (and use P1 interpolation from now on)*/
         switch(this->element_type){
-                case P1Enum: {
-                        GaussPenta *gauss=new GaussPenta();
-                        for(int iv=0;iv<3;iv++){
-                                gauss->GaussVertex(iv);
-                                thickness_input->GetInputValue(&thickness,gauss);
-                                this->values[iv]=0.5*(this->values[iv]+this->values[iv+3]) * thickness;
-                                this->values[iv+3]=this->values[iv];
-                        }
-                        delete gauss;
-                        return; }
+                case P1Enum:
+                case P1bubbleEnum:
+                case P2Enum:
+                          {
+                                this->element_type=P1Enum;
+                                GaussPenta *gauss=new GaussPenta();
+                                for(int iv=0;iv<3;iv++){
+                                        gauss->GaussVertex(iv);
+                                        thickness_input->GetInputValue(&thickness,gauss);
+                                        this->values[iv]=0.5*(this->values[iv]+this->values[iv+3]) * thickness;
+                                        this->values[iv+3]=this->values[iv];
+                                }
+                                delete gauss;
+                                return; 
+                          }
                 default:
                         _error_("not supported yet for type "<<EnumToStringx(this->element_type));