Changeset 13395 for issm/trunk/src/c/modules/AddExternalResultx/AddExternalResultx.cpp

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/modules/AddExternalResultx/AddExternalResultx.cpp (modified) (1 diff)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/trunk/src/c/modules/AddExternalResultx/AddExternalResultx.cpp

@@ -7 +7 @@
 #include "../../Container/Container.h"
 #include "../../io/io.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
                 
-void AddExternalResultx( DataSet* results, int enumtype, double value){
+void AddExternalResultx( DataSet* results, int enumtype, IssmDouble value){
         /* Add new result in into results*/
-        results->AddObject(new DoubleExternalResult(results->Size()+1,enumtype,value,1,0));
+        results->AddObject(new GenericExternalResult<double>(results->Size()+1,enumtype,reCast<IssmPDouble>(value),1,0));
 }
-void AddExternalResultx( DataSet* results, int enumtype, double* value, int nraws){
+void AddExternalResultx( DataSet* results, int enumtype, IssmDouble* value, int nrows){
         /* Add new result in into results*/
-        results->AddObject(new DoubleVecExternalResult(results->Size()+1,enumtype,value,nraws,1,0));
+        #ifdef _HAVE_ADOLC_
+        IssmPDouble* value_passive=xNew<IssmPDouble>(nrows);
+        for(int i=0;i<nrows;i++)value_passive[i]=reCast<IssmPDouble>(value[i]);
+        results->AddObject(new GenericExternalResult<double*>(results->Size()+1,enumtype,value_passive,nrows,1,1,0));
+        xDelete<IssmPDouble>(value_passive);
+        #else
+        results->AddObject(new GenericExternalResult<double*>(results->Size()+1,enumtype,value,nrows,1,1,0));
+        #endif
 }

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4