Changeset 18886

Timestamp:

11/28/14 09:57:31 (10 years ago)

Author:

Eric.Larour

Message:

CHG: allow chasing through a dataset of external results according now to their enum but to their corresponding
name.

Location:

issm/trunk-jpl/src/c/classes/ExternalResults

Files:

• ExternalResult.h (modified) (1 diff)
• GenericExternalResult.h (modified) (2 diffs)
• Results.cpp (modified) (1 diff)
• Results.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/ExternalResults/ExternalResult.h

@@ -28 +28 @@
                 virtual int    GetStep(void)=0;
                 virtual double GetValue(void)=0;
+                virtual int    GetResultEnum(void)=0;
 };
 #endif

issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

@@ -160 +160 @@
                 return name;
 } /*}}}*/
+int GetResultEnum(void){ /*{{{*/
+                return StringToEnumx(this->result_name,false);
+} /*}}}*/
 int   GetStep(void){ /*{{{*/
         return this->step;
 } /*}}}*/
-IssmPDouble GetValue(void){ /*{{{*/
+double GetValue(void){ /*{{{*/
         /*Only supported by IssmPDouble result, error out by default*/
         _error_("not supported for this type of result");
-        return 0.;
+} /*}}}*/
+double* GetValues(void){ /*{{{*/
+        /*Only supported by IssmPDouble* result, error out by default*/
+        _error_("not supported for this type of result");
 } /*}}}*/
 };
@@ -367 +373 @@
         return DoubleMatExternalResultEnum;
 } /*}}}*/
+template <> inline double* GenericExternalResult<IssmPDouble*>::GetValues(void){ /*{{{*/
+        return value;
+} /*}}}*/
 
 /*Specific instantiations for IssmDouble*: */

issm/trunk-jpl/src/c/classes/ExternalResults/Results.cpp

@@ -94 +94 @@
 }
 /*}}}*/
+ExternalResult* Results::FindResult(int result_enum){/*{{{*/
+
+        for(int i=0;i<this->Size();i++){
+                ExternalResult* result=xDynamicCast<ExternalResult*>(this->GetObjectByOffset(i));
+
+                if(result->GetResultEnum()==result_enum){
+                        return result;
+                }
+        }
+        return NULL;
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/ExternalResults/Results.h

@@ -22 +22 @@
                 /*Mehthos*/
                 int AddResult(ExternalResult* result);
+                ExternalResult* FindResult(int result_enum);
                 int DeleteResult(int result_enum,int result_step);
                 void Write(Parameters* parameters);