[issm-svn] r12358 - issm/trunk/src/c/objects/Inputs
morlighe at issm.ess.uci.edu
morlighe at issm.ess.uci.edu
Mon Jun 4 11:22:06 PDT 2012
Author: morlighe
Date: 2012-06-04 11:22:06 -0700 (Mon, 04 Jun 2012)
New Revision: 12358
Modified:
issm/trunk/src/c/objects/Inputs/BoolInput.h
issm/trunk/src/c/objects/Inputs/ControlInput.h
issm/trunk/src/c/objects/Inputs/DatasetInput.h
issm/trunk/src/c/objects/Inputs/DoubleInput.h
issm/trunk/src/c/objects/Inputs/Input.h
issm/trunk/src/c/objects/Inputs/IntInput.h
issm/trunk/src/c/objects/Inputs/PentaP1Input.h
issm/trunk/src/c/objects/Inputs/TransientInput.cpp
issm/trunk/src/c/objects/Inputs/TransientInput.h
issm/trunk/src/c/objects/Inputs/TriaP1Input.h
Log:
Added GetInputValue method for GaussPenta
Modified: issm/trunk/src/c/objects/Inputs/BoolInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/BoolInput.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/BoolInput.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -48,8 +48,9 @@
void GetInputValue(int* pvalue);
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);
Modified: issm/trunk/src/c/objects/Inputs/ControlInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/ControlInput.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/ControlInput.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -53,8 +53,9 @@
void GetInputValue(int* pvalue);
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);
Modified: issm/trunk/src/c/objects/Inputs/DatasetInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/DatasetInput.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/DatasetInput.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -48,8 +48,9 @@
void GetInputValue(int* pvalue){_error_("not implemented yet");};
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
Modified: issm/trunk/src/c/objects/Inputs/DoubleInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/DoubleInput.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/DoubleInput.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -47,8 +47,9 @@
void GetInputValue(int* pvalue);
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);
Modified: issm/trunk/src/c/objects/Inputs/Input.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/Input.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/Input.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -20,14 +20,14 @@
public:
virtual ~Input(){};
- /*Virtual functions:{{{1*/
virtual int InstanceEnum()=0;
virtual void GetInputValue(bool* pvalue)=0;
virtual void GetInputValue(int* pvalue)=0;
virtual void GetInputValue(double* pvalue)=0;
virtual void GetInputValue(double* pvalue,GaussTria* 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,GaussTria* gauss,double time)=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;
virtual void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss)=0;
@@ -64,8 +64,5 @@
virtual Input* PointwiseMax(Input* inputmax)=0;
virtual Input* PointwiseMin(Input* inputmin)=0;
virtual ElementResult* SpawnResult(int step, double time)=0;
-
- /*}}}*/
-
};
#endif
Modified: issm/trunk/src/c/objects/Inputs/IntInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/IntInput.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/IntInput.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -48,8 +48,9 @@
void GetInputValue(int* pvalue);
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);
Modified: issm/trunk/src/c/objects/Inputs/PentaP1Input.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/PentaP1Input.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/PentaP1Input.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -48,8 +48,9 @@
void GetInputValue(int* pvalue){_error_("not implemented yet");};
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
Modified: issm/trunk/src/c/objects/Inputs/TransientInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/TransientInput.cpp 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/TransientInput.cpp 2012-06-04 18:22:06 UTC (rev 12358)
@@ -171,6 +171,22 @@
delete input;
}
/*}}}*/
+/*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){
@@ -183,6 +199,18 @@
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: */
+ Input* input=GetTimeInput(time);
+
+ /*Call input function*/
+ input->GetInputValue(pvalue,gauss);
+
+ delete input;
+}
+/*}}}*/
/*FUNCTION TransientInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{*/
void TransientInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){
Modified: issm/trunk/src/c/objects/Inputs/TransientInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/TransientInput.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/TransientInput.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -50,8 +50,9 @@
void GetInputValue(int* pvalue){_error_("not implemented yet");};
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);
Modified: issm/trunk/src/c/objects/Inputs/TriaP1Input.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/TriaP1Input.h 2012-06-04 18:07:01 UTC (rev 12357)
+++ issm/trunk/src/c/objects/Inputs/TriaP1Input.h 2012-06-04 18:22:06 UTC (rev 12358)
@@ -48,8 +48,9 @@
void GetInputValue(int* pvalue){_error_("not implemented yet");}
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");};
void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);
More information about the issm-svn
mailing list