Changeset 18028

Timestamp:

05/20/14 10:05:52 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed AD compile

File:

• issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp

@@ -81 +81 @@
                 Ialpha = fabs((j - j0)/Den - 1.);
 
-
                 _printf0_(" " << setw(11) << setprecision (5)<<alpha<<" " << setw(11) << setprecision (5)<<Ialpha<<"\n");
                 output[m*2+0] = alpha;
@@ -88 +87 @@
 
         /*output*/
+        #ifdef _HAVE_ADOLC_
+        IssmPDouble* J_passive=xNew<IssmPDouble>(2*num);
+        for(int i=0;i<2*num;i++) J_passive[i]=reCast<IssmPDouble>(J[i]);
+        femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,J_passive,num,2,1,0));
+        xDelete<IssmPDouble>(J_passive);
+        #else
         femmodel->results->AddObject(new GenericExternalResult<IssmPDouble*>(femmodel->results->Size()+1,JEnum,output,num,2,1,0));
+        #endif
 
         /*Clean up and return*/