Changeset 12463

Timestamp:

06/19/12 11:47:17 (13 years ago)

Author:

utke

Message:

type rename

Location:

issm/trunk-jpl/src/c/objects/ElementResults

Files:

• BoolElementResult.cpp (modified) (2 diffs)
• BoolElementResult.h (modified) (3 diffs)
• DoubleElementResult.cpp (modified) (1 diff)
• DoubleElementResult.h (modified) (4 diffs)
• ElementResult.h (modified) (1 diff)
• PentaP1ElementResult.cpp (modified) (3 diffs)
• PentaP1ElementResult.h (modified) (3 diffs)
• TriaP1ElementResult.cpp (modified) (2 diffs)
• TriaP1ElementResult.h (modified) (3 diffs)

issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp

@@ -24 +24 @@
 }
 /*}}}*/
-/*FUNCTION BoolElementResult::BoolElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{*/
-BoolElementResult::BoolElementResult(int in_enum_type,bool in_value,int in_step, double in_time){
+/*FUNCTION BoolElementResult::BoolElementResult(int in_enum_type,IssmDouble in_value,int in_step, IssmDouble in_time){{{*/
+BoolElementResult::BoolElementResult(int in_enum_type,bool in_value,int in_step, IssmDouble in_time){
 
         enum_type=in_enum_type;
@@ -122 +122 @@
           * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values
           * Here, we will supply the enum_type, step, time, interpolation and nodal_values: */
-        double doublevalue=this->value?1:0;
-        patch->fillresultinfo(row,this->enum_type,this->step,this->time,P0Enum,&doublevalue,1);
+        IssmDouble IssmDoublevalue=this->value?1:0;
+        patch->fillresultinfo(row,this->enum_type,this->step,this->time,P0Enum,&IssmDoublevalue,1);
 
 }

issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h

@@ -21 +21 @@
                 bool   value;
                 int    step;
-                double time;
+                IssmDouble time;
 
         public:
@@ -27 +27 @@
                 /*BoolElementResult constructors, destructors: {{{*/
                 BoolElementResult();
-                BoolElementResult(int enum_type,bool value,int step,double time);
+                BoolElementResult(int enum_type,bool value,int step,IssmDouble time);
                 ~BoolElementResult();
                 /*}}}*/
@@ -40 +40 @@
                 /*ElementResult virtual functions definitions: {{{*/
                 ElementResult* SpawnTriaElementResult(int* indices);
-                double  GetTime(void){return time;};
+                IssmDouble  GetTime(void){return time;};
                 int     GetStep(void){return step;};
                 void    ProcessUnits(Parameters* parameters);

issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp

@@ -24 +24 @@
 }
 /*}}}*/
-/*FUNCTION DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{*/
-DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){
+/*FUNCTION DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, IssmDouble in_time){{{*/
+DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, IssmDouble in_time){
 
         enum_type=in_enum_type;

issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h

@@ -1 +1 @@
 /*! \file DoubleElementResult.h 
- *  \brief: header file for double result object
- *  A double result object is just derived from a DoubleInput object, with additional time and step information.
+ *  \brief: header file for IssmDouble result object
+ *  A IssmDouble result object is just derived from a DoubleInput object, with additional time and step information.
  */
 
@@ -19 +19 @@
         private: 
                 int    enum_type;
-                double value;
+                IssmDouble value;
                 int    step;
-                double time;
+                IssmDouble time;
 
         public:
@@ -27 +27 @@
                 /*DoubleElementResult constructors, destructors: {{{*/
                 DoubleElementResult();
-                DoubleElementResult(int enum_type,double value,int step,double time);
+                DoubleElementResult(int enum_type,IssmDouble value,int step,IssmDouble time);
                 ~DoubleElementResult();
                 /*}}}*/
@@ -40 +40 @@
                 /*ElementResult virtual functions definitions: {{{*/
                 ElementResult* SpawnTriaElementResult(int* indices);
-                double  GetTime(void){return time;};
+                IssmDouble  GetTime(void){return time;};
                 int     GetStep(void){return step;};
                 void    ProcessUnits(Parameters* parameters);

issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h

@@ -19 +19 @@
                 
                 virtual         ElementResult* SpawnTriaElementResult(int* indices)=0;
-                virtual double  GetTime(void)=0;
+                virtual IssmDouble  GetTime(void)=0;
                 virtual int     GetStep(void)=0;
                 virtual void    ProcessUnits(Parameters* parameters)=0;

issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp

@@ -24 +24 @@
 }
 /*}}}*/
-/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{*/
-PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){
+/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,IssmDouble* in_values,int in_step, IssmDouble in_time){{{*/
+PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,IssmDouble* in_values,int in_step, IssmDouble in_time){
 
         int i;
@@ -95 +95 @@
         /*output*/
         TriaP1ElementResult* outresult=NULL;
-        double newvalues[3];
+        IssmDouble newvalues[3];
 
         /*Loop over the new indices*/
@@ -140 +140 @@
 void PentaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
 
-        double data[6];
+        IssmDouble data[6];
 
         if(numdofs!=6)_error_("Result %s is a PentaP1ElementResult and cannot write vector of %i dofs",numdofs);
-        for(int i=0;i<6;i++) data[i]=this->values[i]/(double)connectivitylist[i];
+        for(int i=0;i<6;i++) data[i]=this->values[i]/(IssmDouble)connectivitylist[i];
         vector->SetValues(numdofs,doflist,&data[0],ADD_VAL);
 

issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h

@@ -18 +18 @@
         private: 
                 int    enum_type;
-                double values[6];
+                IssmDouble values[6];
                 int    step;
-                double time;
+                IssmDouble time;
 
         public:
@@ -26 +26 @@
                 /*PentaP1ElementResult constructors, destructors: {{{*/
                 PentaP1ElementResult();
-                PentaP1ElementResult(int enum_type,double* values,int step, double time);
+                PentaP1ElementResult(int enum_type,IssmDouble* values,int step, IssmDouble time);
                 ~PentaP1ElementResult();
                 /*}}}*/
@@ -39 +39 @@
                 /*ElementResult virtual functions definitions: {{{*/
                 ElementResult* SpawnTriaElementResult(int* indices);
-                double  GetTime(void){return time;};
+                IssmDouble  GetTime(void){return time;};
                 int     GetStep(void){return step;};
                 void    ProcessUnits(Parameters* parameters);

issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp

@@ -24 +24 @@
 }
 /*}}}*/
-/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{*/
-TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){
+/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,IssmDouble* in_values,int in_step, IssmDouble in_time){{{*/
+TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,IssmDouble* in_values,int in_step, IssmDouble in_time){
 
         enum_type=in_enum_type;
@@ -128 +128 @@
 void TriaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
 
-        double data[3];
+        IssmDouble data[3];
 
         if(numdofs!=3)_error_("Result %s is a TriaP1ElementResult and cannot write vector of %i dofs",numdofs);
-        for(int i=0;i<3;i++) data[i]=this->values[i]/(double)connectivitylist[i];
+        for(int i=0;i<3;i++) data[i]=this->values[i]/(IssmDouble)connectivitylist[i];
         vector->SetValues(numdofs,doflist,&data[0],ADD_VAL);
 

issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h

@@ -17 +17 @@
         private: 
                 int    enum_type;
-                double values[3];
+                IssmDouble values[3];
                 int    step;
-                double time;
+                IssmDouble time;
 
         public:
@@ -25 +25 @@
                 /*TriaP1ElementResult constructors, destructors: {{{*/
                 TriaP1ElementResult();
-                TriaP1ElementResult(int enum_type,double* values,int step,double time);
+                TriaP1ElementResult(int enum_type,IssmDouble* values,int step,IssmDouble time);
                 ~TriaP1ElementResult();
                 /*}}}*/
@@ -38 +38 @@
                 /*ElementResult virtual functions definitions: {{{*/
                 ElementResult* SpawnTriaElementResult(int* indices);
-                double  GetTime(void){return time;};
+                IssmDouble  GetTime(void){return time;};
                 int     GetStep(void){return step;};
                 void    ProcessUnits(Parameters* parameters);