Changeset 12358

Timestamp:

06/04/12 11:22:06 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added GetInputValue method for GaussPenta

Location:

issm/trunk/src/c/objects/Inputs

Files:

• BoolInput.h (modified) (1 diff)
• ControlInput.h (modified) (1 diff)
• DatasetInput.h (modified) (1 diff)
• DoubleInput.h (modified) (1 diff)
• Input.h (modified) (3 diffs)
• IntInput.h (modified) (1 diff)
• PentaP1Input.h (modified) (1 diff)
• TransientInput.cpp (modified) (1 diff)
• TransientInput.h (modified) (1 diff)
• TriaP1Input.h (modified) (1 diff)

issm/trunk/src/c/objects/Inputs/BoolInput.h

@@ -49 +49 @@
                 void GetInputValue(double* pvalue);
                 void GetInputValue(double* pvalue,GaussTria* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss);
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time){_error_("not implemented yet");};
-                void GetInputValue(double* pvalue,GaussPenta* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};

issm/trunk/src/c/objects/Inputs/ControlInput.h

@@ -54 +54 @@
                 void GetInputValue(double* pvalue);
                 void GetInputValue(double* pvalue,GaussTria* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss);
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time){_error_("not implemented yet");};
-                void GetInputValue(double* pvalue,GaussPenta* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};

issm/trunk/src/c/objects/Inputs/DatasetInput.h

@@ -49 +49 @@
                 void GetInputValue(double* pvalue){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");};
+                void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time){_error_("not implemented yet");};
-                void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index);
                 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};

issm/trunk/src/c/objects/Inputs/DoubleInput.h

@@ -48 +48 @@
                 void GetInputValue(double* pvalue);
                 void GetInputValue(double* pvalue,GaussTria* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss);
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time){_error_("not implemented yet");};
-                void GetInputValue(double* pvalue,GaussPenta* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};

issm/trunk/src/c/objects/Inputs/Input.h

@@ -21 +21 @@
                 
                 virtual        ~Input(){};
-                /*Virtual functions:{{{1*/
                 virtual int  InstanceEnum()=0; 
                 virtual void GetInputValue(bool* pvalue)=0;
@@ -27 +26 @@
                 virtual void GetInputValue(double* pvalue)=0;
                 virtual void GetInputValue(double* pvalue,GaussTria* gauss)=0;
+                virtual void GetInputValue(double* pvalue,GaussPenta* gauss)=0;
                 virtual void GetInputValue(double* pvalue,GaussTria* gauss,double time)=0;
-                virtual void GetInputValue(double* pvalue,GaussPenta* gauss)=0;
+                virtual void GetInputValue(double* pvalue,GaussPenta* gauss,double time)=0;
                 virtual void GetInputValue(double* pvalue,GaussTria* gauss ,int index)=0;
                 virtual void GetInputValue(double* pvalue,GaussPenta* gauss,int index)=0;
@@ -65 +65 @@
                 virtual Input* PointwiseMin(Input* inputmin)=0;
                 virtual ElementResult* SpawnResult(int step, double time)=0;
-
-                /*}}}*/
-
 };
 #endif

issm/trunk/src/c/objects/Inputs/IntInput.h

@@ -49 +49 @@
                 void GetInputValue(double* pvalue);
                 void GetInputValue(double* pvalue,GaussTria* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss);
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time){_error_("not implemented yet");};
-                void GetInputValue(double* pvalue,GaussPenta* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};

issm/trunk/src/c/objects/Inputs/PentaP1Input.h

@@ -49 +49 @@
                 void GetInputValue(double* pvalue){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");};
+                void GetInputValue(double* pvalue,GaussPenta* gauss);
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time){_error_("not implemented yet");};
-                void GetInputValue(double* pvalue,GaussPenta* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};

issm/trunk/src/c/objects/Inputs/TransientInput.cpp

@@ -172 +172 @@
 }
 /*}}}*/
+/*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/
+void TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss){
+        double time;
+
+        /*First, recover current time from parameters: */
+        this->parameters->FindParam(&time,TimeEnum);
+
+        /*Retrieve interpolated values for this time step: */
+        Input* input=GetTimeInput(time);
+
+        /*Call input function*/
+        input->GetInputValue(pvalue,gauss);
+
+        delete input;
+}
+/*}}}*/
 /*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussTria* gauss,double time){{{*/
 void TransientInput::GetInputValue(double* pvalue,GaussTria* gauss,double time){
+
+        /*Retrieve interpolated values for this time step: */
+        Input* input=GetTimeInput(time);
+
+        /*Call input function*/
+        input->GetInputValue(pvalue,gauss);
+
+        delete input;
+}
+/*}}}*/
+/*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss,double time){{{*/
+void TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss,double time){
 
         /*Retrieve interpolated values for this time step: */

issm/trunk/src/c/objects/Inputs/TransientInput.h

@@ -51 +51 @@
                 void GetInputValue(double* pvalue){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time);
-                void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time);
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};

issm/trunk/src/c/objects/Inputs/TriaP1Input.h

@@ -49 +49 @@
                 void GetInputValue(double* pvalue){_error_("not implemented yet");}
                 void GetInputValue(double* pvalue,GaussTria* gauss);
+                void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss,double time){_error_("not implemented yet");};
-                void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
+                void GetInputValue(double* pvalue,GaussPenta* gauss,double time){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
                 void GetInputValue(double* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");};