Changeset 17338

Timestamp:

02/21/14 14:16:13 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved some GetInputValue to Element.cpp

Location:

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

Files:

• Element.cpp (modified) (1 diff)
• Element.h (modified) (2 diffs)
• Penta.cpp (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• Tria.h (modified) (1 diff)

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

@@ -369 +369 @@
 }
 /*}}}*/
+void Element::GetInputValue(bool* pvalue,int inputenum){/*{{{*/
+
+        Input* input=inputs->GetInput(inputenum);
+        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
+        input->GetInputValue(pvalue);
+
+}/*}}}*/
+void Element::GetInputValue(int* pvalue,int inputenum){/*{{{*/
+
+        Input* input=inputs->GetInput(inputenum);
+        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
+        input->GetInputValue(pvalue);
+
+}/*}}}*/
+void Element::GetInputValue(IssmDouble* pvalue,int inputenum){/*{{{*/
+
+        Input* input=inputs->GetInput(inputenum);
+        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
+        input->GetInputValue(pvalue);
+
+}/*}}}*/
+void Element::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum){/*{{{*/
+
+        Input* input=inputs->GetInput(inputenum);
+        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
+        input->GetInputValue(pvalue,gauss);
+
+}/*}}}*/
 void Element::GetVerticesSidList(int* sidlist){/*{{{*/
 

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

@@ -69 +69 @@
                 void       GetInputListOnVertices(IssmDouble* pvalue,int enumtype);
                 void       GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue);
+                void       GetInputValue(bool* pvalue,int enum_type);
+                void       GetInputValue(int* pvalue,int enum_type);
+                void       GetInputValue(IssmDouble* pvalue,int enum_type);
+                void       GetInputValue(IssmDouble* pvalue,Gauss* gauss,int enum_type);
                 IssmDouble GetMaterialParameter(int enum_in);
                 void       GetPhi(IssmDouble* phi, IssmDouble*  epsilon, IssmDouble viscosity);
@@ -168 +172 @@
                 virtual IssmDouble GetGroundedPortion(IssmDouble* xyz_list)=0;
                 virtual void   GetInputValue(IssmDouble* pvalue,Node* node,int enumtype)=0;
-                virtual void   GetInputValue(bool* pvalue,int enum_type)=0;
-                virtual void   GetInputValue(int* pvalue,int enum_type)=0;
-                virtual void   GetInputValue(IssmDouble* pvalue,int enum_type)=0;
-                virtual void   GetInputValue(IssmDouble* pvalue,Gauss* gauss,int enum_type)=0;
                 virtual Node*  GetNode(int node_number)=0;
                 virtual void   GetVerticesCoordinates(IssmDouble** xyz_list)=0;

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

@@ -907 +907 @@
 }
 /*}}}*/
-/*FUNCTION Penta::GetInputValue(bool* pvalue,int inputenum) {{{*/
-void Penta::GetInputValue(bool* pvalue,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue);
-
-}/*}}}*/
-/*FUNCTION Penta::GetInputValue(int* pvalue,int inputenum) {{{*/
-void Penta::GetInputValue(int* pvalue,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue);
-
-}/*}}}*/
-/*FUNCTION Penta::GetInputValue(IssmDouble* pvalue,int inputenum) {{{*/
-void Penta::GetInputValue(IssmDouble* pvalue,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue);
-
-}/*}}}*/
-/*FUNCTION Penta::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum) {{{*/
-void Penta::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue,gauss);
-
-}/*}}}*/
 /*FUNCTION Penta::GetVerticesCoordinates(IssmDouble** pxyz_list){{{*/
 void Penta::GetVerticesCoordinates(IssmDouble** pxyz_list){

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

@@ -203 +203 @@
                 int            GetElementType(void);
                 void           GetInputValue(IssmDouble* pvalue,Node* node,int enumtype);
-                void           GetInputValue(bool* pvalue,int enum_type);
-                void           GetInputValue(int* pvalue,int enum_type);
-                void           GetInputValue(IssmDouble* pvalue,int enum_type);
-                void           GetInputValue(IssmDouble* pvalue,Gauss* gauss,int enum_type);
                 Node*          GetNode(int node_number);
                 void           InputChangeName(int input_enum, int enum_type_old);

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

@@ -125 +125 @@
                 IssmDouble  GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");};
                 void        GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");};
-                void        GetInputValue(bool* pvalue,int enum_type){_error_("not implemented yet");};
-                void        GetInputValue(int* pvalue,int enum_type){_error_("not implemented yet");};
-                void        GetInputValue(IssmDouble* pvalue,int enum_type){_error_("not implemented yet");};
-                void        GetInputValue(IssmDouble* pvalue,Gauss* gauss,int enum_type){_error_("not implemented yet");};
                 Node*       GetNode(int node_number){_error_("Not implemented");};
                 IssmDouble  GetXcoord(Gauss* gauss){_error_("Not implemented");};

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

@@ -984 +984 @@
 }
 /*}}}*/
-/*FUNCTION Tria::GetInputValue(bool* pvalue,int inputenum) {{{*/
-void Tria::GetInputValue(bool* pvalue,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue);
-
-}/*}}}*/
-/*FUNCTION Tria::GetInputValue(int* pvalue,int inputenum) {{{*/
-void Tria::GetInputValue(int* pvalue,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue);
-
-}/*}}}*/
-/*FUNCTION Tria::GetInputValue(IssmDouble* pvalue,int inputenum) {{{*/
-void Tria::GetInputValue(IssmDouble* pvalue,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue);
-
-}/*}}}*/
-/*FUNCTION Tria::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum) {{{*/
-void Tria::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum){
-
-        Input* input=inputs->GetInput(inputenum);
-        if(!input) _error_("Input " << EnumToStringx(inputenum) << " not found in element");
-        input->GetInputValue(pvalue,gauss);
-
-}/*}}}*/
 Node* Tria::GetNode(int node_number){/*{{{*/
         _assert_(node_number>=0); 

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

@@ -213 +213 @@
                 void           NormalBase(IssmDouble* normal,IssmDouble* xyz_list);
                 void           GetInputValue(IssmDouble* pvalue,Node* node,int enumtype);
-                void           GetInputValue(bool* pvalue,int enum_type);
-                void           GetInputValue(int* pvalue,int enum_type);
-                void           GetInputValue(IssmDouble* pvalue,int enum_type);
-                void           GetInputValue(IssmDouble* pvalue,Gauss* gauss,int enum_type);
                 void           GetMaterialInputValue(IssmDouble* pvalue,Node* node,int enumtype);
                 Node*          GetNode(int node_number);