Changeset 15353

Timestamp:

06/28/13 17:08:54 (12 years ago)

Author:

bdef

Message:

CHG: Added a GetSOlutionFromInputOneDof in place of the three existing Hydrologicaal GetSolutionfromInputs

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Tria.cpp (modified) (5 diffs)
• Tria.h (modified) (1 diff)

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

@@ -336 +336 @@
                         _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
         }
-
 }
 /*}}}*/
@@ -1485 +1484 @@
         #ifdef _HAVE_HYDROLOGY_
         case HydrologyShreveAnalysisEnum:
-                GetSolutionFromInputsHydrologyShreve(solution);
+                GetSolutionFromInputsOneDof(solution,WatercolumnEnum);
                 break;
         case HydrologyDCInefficientAnalysisEnum:
-                GetSolutionFromInputsHydrologyDCInefficient(solution);
+                GetSolutionFromInputsOneDof(solution,SedimentHeadEnum);
                 break;
         case HydrologyDCEfficientAnalysisEnum:
-                GetSolutionFromInputsHydrologyDCEfficient(solution);
+                GetSolutionFromInputsOneDof(solution,EplHeadEnum);
                 break;
         #endif
@@ -6339 +6338 @@
 }
 /*}}}*/
-/*FUNCTION Tria::GetSolutionFromInputsHydrologyShreve{{{*/
-void  Tria::GetSolutionFromInputsHydrologyShreve(Vector<IssmDouble>* solution){
+/*FUNCTION Tria::GetSolutionFromInputsOneDof{{{*/
+void  Tria::GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution, int enum_type){
+        
         const int    numdof=NDOF1*NUMVERTICES;
 
         int         i;
         int        *doflist = NULL;
-        IssmDouble  watercolumn;
+        IssmDouble  enum_value;
         IssmDouble  values[numdof];
         GaussTria  *gauss   = NULL;
@@ -6353 +6353 @@
 
         /*Get inputs*/
-        Input* watercolumn_input=inputs->GetInput(WatercolumnEnum); _assert_(watercolumn_input);
-
-        /*Ok, we have watercolumn values, fill in watercolumn array: */
+        Input* enum_input=inputs->GetInput(enum_type); _assert_(enum_input);
+
+        /*Ok, we have the values, fill in the array: */
         /*P1 element only for now*/
         gauss=new GaussTria();
@@ -6362 +6362 @@
                 gauss->GaussVertex(i);
 
-                /*Recover watercolumn*/
-                watercolumn_input->GetInputValue(&watercolumn,gauss);
-                values[i]=watercolumn;
-        }
-
-        solution->SetValues(numdof,doflist,values,INS_VAL);
-
-        /*Free ressources:*/
-        delete gauss;
-        xDelete<int>(doflist);
-}
-/*}}}*/
-/*FUNCTION Tria::GetSolutionFromInputsHydrologyDCInefficient{{{*/
-void  Tria::GetSolutionFromInputsHydrologyDCInefficient(Vector<IssmDouble>* solution){
-
-        const int    numdof=NDOF1*NUMVERTICES;
-
-        int         i;
-        int        *doflist = NULL;
-        IssmDouble  sedimenthead;
-        IssmDouble  values[numdof];
-        GaussTria  *gauss   = NULL;
-
-        /*Get dof list: */
-        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
-
-        /*Get inputs*/
-        Input* sedimenthead_input=inputs->GetInput(SedimentHeadEnum); _assert_(sedimenthead_input);
-
-        /*P1 element only for now*/
-        gauss=new GaussTria();
-        for(i=0;i<NUMVERTICES;i++){
-
-                gauss->GaussVertex(i);
-                sedimenthead_input->GetInputValue(&sedimenthead,gauss);
-                values[i]=sedimenthead;
-        }
-
-        solution->SetValues(numdof,doflist,values,INS_VAL);
-
-        /*Free ressources:*/
-        delete gauss;
-        xDelete<int>(doflist);
-}
-/*}}}*/
-/*FUNCTION Tria::GetSolutionFromInputsHydrologyDCEfficient{{{*/
-void  Tria::GetSolutionFromInputsHydrologyDCEfficient(Vector<IssmDouble>* solution){
-
-        const int    numdof=NDOF1*NUMVERTICES;
-
-        int         i;
-        int        *doflist = NULL;
-        IssmDouble  eplhead;
-        IssmDouble  values[numdof];
-        GaussTria  *gauss   = NULL;
-
-        /*Get dof list: */
-        GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
-
-        /*Get inputs*/
-        Input* eplhead_input=inputs->GetInput(EplHeadEnum); _assert_(eplhead_input);
-
-        /*P1 element only for now*/
-        gauss=new GaussTria();
-        for(i=0;i<NUMVERTICES;i++){
-                gauss->GaussVertex(i);
-                eplhead_input->GetInputValue(&eplhead,gauss);
-                values[i]=eplhead;
+                /*Recover dof values*/
+                enum_input->GetInputValue(&enum_value,gauss);
+                values[i]=enum_value;
         }
 

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -246 +246 @@
                 ElementVector* CreatePVectorHydrologyDCInefficient(void);
                 ElementVector* CreatePVectorHydrologyDCEfficient(void);
-                void      GetSolutionFromInputsHydrologyShreve(Vector<IssmDouble>* solution);
-                void      GetSolutionFromInputsHydrologyDCInefficient(Vector<IssmDouble>* solution);
-                void      GetSolutionFromInputsHydrologyDCEfficient(Vector<IssmDouble>* solution);
+                void    GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution,int enum_type);
                 void    CreateHydrologyWaterVelocityInput(void);
                 void    UpdateConstraints(void);