Changeset 15082 for issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.cpp

Timestamp:

05/22/13 11:24:30 (12 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed InputConvergence module that is not used anymore and calls GetValuesPtr, which HAS to be deleted because it is wrong to plya with the pointer of another object's field

File:

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

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

@@ -477 +477 @@
 void PentaP1Input::VerticallyIntegrate(Input* thickness_input){
 
-        /*Intermediaries*/
-        int i;
-        const int  numnodes = 6;
-        int        num_thickness_values;
-        IssmDouble    *thickness_values = NULL;
+        IssmDouble thickness;
 
         /*Check that input provided is a thickness*/
         if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
 
-        /*Get Thickness value pointer*/
-        thickness_input->GetValuesPtr(&thickness_values,&num_thickness_values);
-
         /*vertically integrate depending on type:*/
         switch(thickness_input->ObjectEnum()){
 
-                case PentaP1InputEnum:
-                        for(i=0;i<3;i++){
-                                this->values[i]=0.5*(this->values[i]+this->values[i+3]) * thickness_values[i];
-                                this->values[i+3]=this->values[i];
+                case PentaP1InputEnum:{
+                        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];
                         }
-                        return;
+                        delete gauss;
+                        return; }
 
                 default:
@@ -600 +597 @@
 
 } /*}}}*/
-/*FUNCTION PentaP1Input::GetValuesPtr{{{*/
-void PentaP1Input::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){
-
-        *pvalues=this->values;
-        *pnum_values=6;
-
-}
-/*}}}*/
 /*FUNCTION PentaP1Input::Configure{{{*/
 void PentaP1Input::Configure(Parameters* parameters){