Changeset 12534

Timestamp:

06/25/12 14:51:15 (13 years ago)

Author:

utke

Message:

make consistently active

Location:

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

Files:

• Option.h (modified) (1 diff)
• OptionCell.h (modified) (1 diff)
• OptionChar.h (modified) (1 diff)
• OptionDouble.cpp (modified) (5 diffs)
• OptionDouble.h (modified) (3 diffs)
• OptionLogical.h (modified) (1 diff)
• OptionStruct.h (modified) (1 diff)
• OptionUtilities.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/Options/Option.h

@@ -43 +43 @@
                 virtual int*  Size()=0;
                 virtual void  Get(int* pvalue)=0;
-                virtual void  Get(IssmPDouble* pvalue)=0;
+                virtual void  Get(IssmDouble* pvalue)=0;
                 virtual void  Get(bool* pvalue)=0;
                 virtual void  Get(char** pvalue)=0;
                 virtual void  Get(char*** ppvalue,int *pnumel)=0;
-                virtual void  Get(IssmPDouble** pvalue,int *pnumel)=0;
+                virtual void  Get(IssmDouble** pvalue,int *pnumel)=0;
                 virtual void  Get(Options** pvalue)=0;
                 virtual void  Get(Options*** ppvalue,int *pnumel)=0;

issm/trunk-jpl/src/c/objects/Options/OptionCell.h

@@ -40 +40 @@
                 int*  Size();
                 void  Get(int* pvalue){_error2_("An OptionCell object cannot return a int");};
-                void  Get(IssmPDouble* pvalue){_error2_("An OptionCell object cannot return a IssmPDouble");};
+                void  Get(IssmDouble* pvalue){_error2_("An OptionCell object cannot return a IssmDouble");};
                 void  Get(bool* pvalue){  _error2_("An OptionCell object cannot return a bool");};
                 void  Get(char** pvalue){ _error2_("An OptionCell object cannot return a string");};
                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionCell object cannot return a string vec");};
-                void  Get(IssmPDouble** pvalue,int *pnumel){ _error2_("An OptionCell object cannot return a IssmPDouble vec");};
+                void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionCell object cannot return a IssmDouble vec");};
                 void  Get(Options** pvalue);
                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionCell object cannot return an Options DataSet vec");};

issm/trunk-jpl/src/c/objects/Options/OptionChar.h

@@ -40 +40 @@
                 int*  Size();
                 void  Get(int* pvalue){_error2_("An OptionChar object cannot return a int");};
-                void  Get(IssmPDouble* pvalue){_error2_("An OptionChar object cannot return a IssmPDouble");};
+                void  Get(IssmDouble* pvalue){_error2_("An OptionChar object cannot return a IssmDouble");};
                 void  Get(bool* pvalue){  _error2_("An OptionChar object cannot return a bool");};
                 void  Get(char** pvalue);
                 void  Get(char*** ppvalue,int *pnumel);
-                void  Get(IssmPDouble** pvalue,int *pnumel){ _error2_("An OptionChar object cannot return a IssmPDouble vec");};
+                void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionChar object cannot return a IssmDouble vec");};
                 void  Get(Options** pvalue){ _error2_("An OptionChar object cannot return an Options DataSet");};
                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionChar object cannot return an Options DataSet vec");};

issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp

@@ -1 +1 @@
 /*!\file OptionDouble.cpp
- * \brief: implementation of the optionsIssmPDouble object
+ * \brief: implementation of the optionsIssmDouble object
  */
 
@@ -31 +31 @@
 OptionDouble::~OptionDouble(){
 
-        if (values) xDelete<IssmPDouble>(values);
+        if (values) xDelete<IssmDouble>(values);
 
 }
@@ -50 +50 @@
                 else {
                         StringFromSize(cstr,size,ndims);
-                        if(flag) _pprintLine_("        values: " << cstr << " " << "IssmPDouble");
+                        if(flag) _pprintLine_("        values: " << cstr << " " << "IssmDouble");
                 }
         }
@@ -132 +132 @@
 }
 /*}}}*/
-/*FUNCTION OptionDouble::Get(IssmPDouble* pvalue) {{{*/
-void OptionDouble::Get(IssmPDouble* pvalue){
+/*FUNCTION OptionDouble::Get(IssmDouble* pvalue) {{{*/
+void OptionDouble::Get(IssmDouble* pvalue){
 
         /*We should first check that the size is one*/
         if(this->NumEl()!=1){
-                _error2_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single IssmPDouble");
+                _error2_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single IssmDouble");
         }
 
@@ -144 +144 @@
 }
 /*}}}*/
-/*FUNCTION OptionDouble::Get(IssmPDouble** pvalue,int* numel) {{{*/
-void OptionDouble::Get(IssmPDouble** pvalue,int* numel){
+/*FUNCTION OptionDouble::Get(IssmDouble** pvalue,int* numel) {{{*/
+void OptionDouble::Get(IssmDouble** pvalue,int* numel){
 
         /*We should first check that the size is at least one*/
         if(this->NumEl()<=0){
-                _error2_("option \"" << this->name << "\" is empty and cannot return a IssmPDouble vector");
+                _error2_("option \"" << this->name << "\" is empty and cannot return a IssmDouble vector");
         }
 
         /*Copy vector*/
-        IssmPDouble* outvalue=xNew<IssmPDouble>(this->NumEl());
+        IssmDouble* outvalue=xNew<IssmDouble>(this->NumEl());
         for(int i=0;i<this->NumEl();i++) outvalue[i]=this->values[i];
 

issm/trunk-jpl/src/c/objects/Options/OptionDouble.h

@@ -1 +1 @@
 /*! \file OptionDouble.h 
- *  \brief: header file for optionIssmPDouble object
+ *  \brief: header file for optionIssmDouble object
  */
 
@@ -18 +18 @@
         public:
 
-                IssmPDouble* values;
+                IssmDouble* values;
 
                 /*OptionDouble constructors, destructors {{{*/
@@ -40 +40 @@
                 int*  Size();
                 void  Get(int* pvalue);
-                void  Get(IssmPDouble* pvalue);
+                void  Get(IssmDouble* pvalue);
                 void  Get(bool* pvalue){  _error2_("An OptionDouble object cannot return a bool");};
                 void  Get(char** pvalue){ _error2_("An OptionDouble object cannot return a string");};
                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionDouble object cannot return a string vec");};
-                void  Get(IssmPDouble** pvalue,int* pnumel);
+                void  Get(IssmDouble** pvalue,int* pnumel);
                 void  Get(Options** pvalue){ _error2_("An OptionDouble object cannot return an Options DataSet");};
                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionDouble object cannot return an Options DataSet vec");};

issm/trunk-jpl/src/c/objects/Options/OptionLogical.h

@@ -40 +40 @@
                 int*  Size();
                 void  Get(int* pvalue){_error2_("An OptionLogical object cannot return a int");};
-                void  Get(IssmPDouble* pvalue){_error2_("An OptionLogical object cannot return a IssmPDouble");};
+                void  Get(IssmDouble* pvalue){_error2_("An OptionLogical object cannot return a IssmDouble");};
                 void  Get(bool* pvalue);
                 void  Get(char** pvalue){ _error2_("An OptionLogical object cannot return a string");};
                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionLogical object cannot return a string vec");};
-                void  Get(IssmPDouble** pvalue,int *pnumel){ _error2_("An OptionLogical object cannot return a IssmPDouble vec");};
+                void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionLogical object cannot return a IssmDouble vec");};
                 void  Get(Options** pvalue){ _error2_("An OptionLogical object cannot return an Options DataSet");};
                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionLogical object cannot return an Options DataSet vec");};

issm/trunk-jpl/src/c/objects/Options/OptionStruct.h

@@ -40 +40 @@
                 int*  Size();
                 void  Get(int* pvalue){_error2_("An OptionStruct object cannot return a int");};
-                void  Get(IssmPDouble* pvalue){_error2_("An OptionStruct object cannot return a IssmPDouble");};
+                void  Get(IssmDouble* pvalue){_error2_("An OptionStruct object cannot return a IssmDouble");};
                 void  Get(bool* pvalue){  _error2_("An OptionStruct object cannot return a bool");};
                 void  Get(char** pvalue){ _error2_("An OptionStruct object cannot return a string");};
                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionStruct object cannot return a string vec");};
-                void  Get(IssmPDouble** pvalue,int *pnumel){ _error2_("An OptionStruct object cannot return a IssmPDouble vec");};
+                void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionStruct object cannot return a IssmDouble vec");};
                 void  Get(Options** pvalue);
                 void  Get(Options*** ppvalue,int *pnumel);

issm/trunk-jpl/src/c/objects/Options/OptionUtilities.cpp

@@ -31 +31 @@
         /*calculate the dimensions (being careful of integer division)  */
         for (i=ndims-1; i>=0; i--) {
-                aprod=(int)(((IssmPDouble)aprod+0.5)/(IssmPDouble)size[i]);
-                dims[i]=(int)floor(((IssmPDouble)index+0.5)/(IssmPDouble)aprod);
+                aprod=(int)(((IssmDouble)aprod+0.5)/(IssmDouble)size[i]);
+                dims[i]=(int)floor(((IssmDouble)index+0.5)/(IssmDouble)aprod);
                 index-=dims[i]*aprod;
         }
@@ -69 +69 @@
         /*calculate the dimensions (being careful of integer division)  */
         for (i=0; i<ndims; i++) {
-                aprod=(int)(((IssmPDouble)aprod+0.5)/(IssmPDouble)size[i]);
-                dims[i]=(int)floor(((IssmPDouble)index+0.5)/(IssmPDouble)aprod);
+                aprod=(int)(((IssmDouble)aprod+0.5)/(IssmDouble)size[i]);
+                dims[i]=(int)floor(((IssmDouble)index+0.5)/(IssmDouble)aprod);
                 index-=dims[i]*aprod;
         }