Changeset 12706 for issm/trunk/src/c/objects/Inputs/TransientInput.cpp

Timestamp:

07/24/12 10:36:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

File:

• issm/trunk/src/c/objects/Inputs/TransientInput.cpp (modified) (22 diffs)

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

@@ -46 +46 @@
 /*FUNCTION TransientInput::~TransientInput{{{*/
 TransientInput::~TransientInput(){
-        xfree((void**)&this->timesteps);
+        xDelete<IssmDouble>(this->timesteps);
         this->timesteps=NULL;
         this->numtimesteps=0;
@@ -66 +66 @@
         int i;
 
-        printf("TransientInput:\n");
-        printf("   enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
-        printf("   numtimesteps: %i\n",this->numtimesteps);
-        printf("---inputs: \n"); 
+        _printLine_("TransientInput:");
+        _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
+        _printLine_("   numtimesteps: " << this->numtimesteps);
+        _printLine_("---inputs: "); 
         for(i=0;i<this->numtimesteps;i++){
-                printf("   time: %g  \n",this->timesteps[i]);
+                _printLine_("   time: " << this->timesteps[i] << "  ");
                 ((Input*)this->inputs->GetObjectByOffset(i))->Echo();
         }
@@ -100 +100 @@
         output->enum_type=this->enum_type;
         output->numtimesteps=this->numtimesteps;
-        output->timesteps=(double*)xmalloc(this->numtimesteps*sizeof(double));
-   memcpy(output->timesteps,this->timesteps,this->numtimesteps*sizeof(double));
+        output->timesteps=xNew<IssmDouble>(this->numtimesteps);
+   memcpy(output->timesteps,this->timesteps,this->numtimesteps*sizeof(IssmDouble));
         output->inputs=(Inputs*)this->inputs->Copy();
         output->parameters=this->parameters;
@@ -128 +128 @@
         outinput->enum_type=this->enum_type;
         outinput->numtimesteps=this->numtimesteps;
-        outinput->timesteps=(double*)xmalloc(this->numtimesteps*sizeof(double));
-        memcpy(outinput->timesteps,this->timesteps,this->numtimesteps*sizeof(double));
+        outinput->timesteps=xNew<IssmDouble>(this->numtimesteps);
+        memcpy(outinput->timesteps,this->timesteps,this->numtimesteps*sizeof(IssmDouble));
         outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(indices);
         outinput->parameters=this->parameters;
@@ -139 +139 @@
 /*}}}*/
 /*FUNCTION TransientInput::SpawnResult{{{*/
-ElementResult* TransientInput::SpawnResult(int step, double time){
+ElementResult* TransientInput::SpawnResult(int step, IssmDouble time){
 
         ElementResult* elementresult=NULL;
@@ -156 +156 @@
 
 /*Object functions*/
-/*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussTria* gauss){{{*/
-void TransientInput::GetInputValue(double* pvalue,GaussTria* gauss){
-        double time;
+/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/
+void TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){
+        IssmDouble time;
 
         /*First, recover current time from parameters: */
@@ -172 +172 @@
 }
 /*}}}*/
-/*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/
-void TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss){
-        double time;
+/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/
+void TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){
+        IssmDouble time;
 
         /*First, recover current time from parameters: */
@@ -188 +188 @@
 }
 /*}}}*/
-/*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussTria* gauss,double time){{{*/
-void TransientInput::GetInputValue(double* pvalue,GaussTria* gauss,double time){
+/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){{{*/
+void TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){
 
         /*Retrieve interpolated values for this time step: */
@@ -200 +200 @@
 }
 /*}}}*/
-/*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss,double time){{{*/
-void TransientInput::GetInputValue(double* pvalue,GaussPenta* gauss,double time){
+/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){{{*/
+void TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){
 
         /*Retrieve interpolated values for this time step: */
@@ -212 +212 @@
 }
 /*}}}*/
-/*FUNCTION TransientInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{*/
-void TransientInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){
-
-        double time;
+/*FUNCTION TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){{{*/
+void TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){
+
+        IssmDouble time;
 
         /*First, recover current time from parameters: */
@@ -236 +236 @@
 /*}}}*/
 /*FUNCTION TransientInput::GetInputAverage{{{*/
-void TransientInput::GetInputAverage(double* pvalue){
+void TransientInput::GetInputAverage(IssmDouble* pvalue){
         
-        double time;
+        IssmDouble time;
 
         /*First, recover current time from parameters: */
@@ -256 +256 @@
 /*Intermediary*/
 /*FUNCTION TransientInput::AddTimeInput{{{*/
-void TransientInput::AddTimeInput(Input* input,double time){
+void TransientInput::AddTimeInput(Input* input,IssmDouble time){
 
         /*insert values at time step: */
@@ -262 +262 @@
 
         //copy timesteps, add the new time, delete previous timesteps, and add the new input: inputs->AddObject(input);
-        double* old_timesteps=NULL;
+        IssmDouble* old_timesteps=NULL;
 
         if (this->numtimesteps > 0){
-                old_timesteps=(double*)xmalloc(this->numtimesteps*sizeof(double));
-                memcpy(old_timesteps,this->timesteps,this->numtimesteps*sizeof(double));
-                xfree((void**)&this->timesteps); 
+                old_timesteps=xNew<IssmDouble>(this->numtimesteps);
+                memcpy(old_timesteps,this->timesteps,this->numtimesteps*sizeof(IssmDouble));
+                xDelete<IssmDouble>(this->timesteps); 
         }
 
         this->numtimesteps=this->numtimesteps+1;
-        this->timesteps=(double*)xmalloc(this->numtimesteps*sizeof(double));
+        this->timesteps=xNew<IssmDouble>(this->numtimesteps);
 
         if (this->numtimesteps > 1){
-                memcpy(this->timesteps,old_timesteps,(this->numtimesteps-1)*sizeof(double));
-                xfree((void**)&old_timesteps);
+                memcpy(this->timesteps,old_timesteps,(this->numtimesteps-1)*sizeof(IssmDouble));
+                xDelete<IssmDouble>(old_timesteps);
         }
 
@@ -285 +285 @@
 /*}}}*/
 /*FUNCTION TransientInput::SquareMin{{{*/
-void TransientInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
-
-        double time;
+void TransientInput::SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){
+
+        IssmDouble time;
 
         /*First, recover current time from parameters: */
@@ -303 +303 @@
 /*}}}*/
 /*FUNCTION TransientInput::InfinityNorm{{{*/
-double TransientInput::InfinityNorm(void){
-
-        double time;
-        double infnorm;
+IssmDouble TransientInput::InfinityNorm(void){
+
+        IssmDouble time;
+        IssmDouble infnorm;
 
         /*First, recover current time from parameters: */
@@ -323 +323 @@
 /*}}}*/
 /*FUNCTION TransientInput::Max{{{*/
-double TransientInput::Max(void){
-
-        double time;
-        double max;
+IssmDouble TransientInput::Max(void){
+
+        IssmDouble time;
+        IssmDouble max;
 
         /*First, recover current time from parameters: */
@@ -343 +343 @@
 /*}}}*/
 /*FUNCTION TransientInput::MaxAbs{{{*/
-double TransientInput::MaxAbs(void){
-
-        double time;
-        double maxabs;
+IssmDouble TransientInput::MaxAbs(void){
+
+        IssmDouble time;
+        IssmDouble maxabs;
 
         /*First, recover current time from parameters: */
@@ -364 +364 @@
 /*}}}*/
 /*FUNCTION TransientInput::Min{{{*/
-double TransientInput::Min(void){
-
-        double time;
-        double min;
+IssmDouble TransientInput::Min(void){
+
+        IssmDouble time;
+        IssmDouble min;
 
         /*First, recover current time from parameters: */
@@ -385 +385 @@
 /*}}}*/
 /*FUNCTION TransientInput::MinAbs{{{*/
-double TransientInput::MinAbs(void){
-
-        double time;
-        double minabs;
+IssmDouble TransientInput::MinAbs(void){
+
+        IssmDouble time;
+        IssmDouble minabs;
 
         /*First, recover current time from parameters: */
@@ -407 +407 @@
 void TransientInput::GetVectorFromInputs(Vector* vector,int* doflist){
 
-        double time;
+        IssmDouble time;
 
         /*First, recover current time from parameters: */
@@ -422 +422 @@
 } /*}}}*/
 /*FUNCTION TransientInput::GetTimeInput{{{*/
-Input* TransientInput::GetTimeInput(double intime){
+Input* TransientInput::GetTimeInput(IssmDouble intime){
 
         int     i,j;
-        double  deltat;
-        double  alpha1,alpha2;
+        IssmDouble  deltat;
+        IssmDouble  alpha1,alpha2;
         bool    found=false;
         Input*  input=NULL;
@@ -474 +474 @@
                 }
         }
-        if(!found)_error_("did not find time interval on which to interpolate forcing values!");
+        if(!found)_error2_("did not find time interval on which to interpolate forcing values!");
 
         /*Assign output pointer*/