Changeset 19490

Timestamp:

08/13/15 12:32:28 (10 years ago)

Author:

snarayan

Message:

Patches to use latest ADOL-C

Location:

issm/trunk-jpl

Files:

• externalpackages/adolc/install-withampi.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/cores/ad_core.cpp (modified) (6 diffs)
• src/c/shared/Numerics/isnan.h (modified) (2 diffs)
• src/c/toolkits/gsl/DenseGslSolve.cpp (modified) (1 diff)

issm/trunk-jpl/externalpackages/adolc/install-withampi.sh

@@ -5 +5 @@
 rm -rf install src
 
-git clone -b ampi git://git.mcs.anl.gov/adol-c.git src
+git clone https://gitlab.com/adol-c/adol-c.git src
 #git reset --hard b254b2a001a1b7a024a9184cd087ae06eb975cad
 

issm/trunk-jpl/m4/issm_options.m4

@@ -722 +722 @@
         fi
         AM_CONDITIONAL([ADOLC], [test x$HAVE_ADOLC = xyes])
+        AM_COND_IF(ADOLC,[CXXFLAGS+=" -std=c++11"])
         dnl }}}
         dnl adolc-version{{{

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

@@ -116 +116 @@
                         femmodel->parameters->FindParam(&driver,AutodiffDriverEnum);
 
-                        /* these are always needed regardless of the interpreter */
-                        anEDF_for_solverx_p->dp_x=xNew<double>(anEDF_for_solverx_p->max_n);
-                        anEDF_for_solverx_p->dp_y=xNew<double>(anEDF_for_solverx_p->max_m);
 
                         if (strcmp(driver,"fos_forward")==0){ /*{{{*/
@@ -143 +140 @@
 #endif
 
-                                /*allocate the space for the parameters to invoke the EDF fos_forward:*/
-                                anEDF_for_solverx_p->dp_X=xNew<double>(anEDF_for_solverx_p->max_n);
-                                anEDF_for_solverx_p->dp_Y=xNew<double>(anEDF_for_solverx_p->max_m);
 
                                 /*call driver: */
@@ -190 +184 @@
                                 // anEDF_for_solverx_p->fov_reverse=EDF_fov_reverse_for_solverx;
 
-                                /*allocate the space for the parameters to invoke EDF fov_forward:*/
-                                anEDF_for_solverx_p->dpp_X=xNew<double>(anEDF_for_solverx_p->max_n, tangentDirNum);
-                                anEDF_for_solverx_p->dpp_Y=xNew<double>(anEDF_for_solverx_p->max_m, tangentDirNum);
 
                                 /*seed matrix: */
@@ -252 +243 @@
 #endif
 
-                                /*allocate the space for the parameters to invoke the EDF fos_reverse :*/
-                                anEDF_for_solverx_p->dp_U=xNew<double>(anEDF_for_solverx_p->max_m);
-                                anEDF_for_solverx_p->dp_Z=xNew<double>(anEDF_for_solverx_p->max_n);
 
                                 /*call driver: */
@@ -296 +284 @@
                                 #endif
 
-                                /*allocate the space for the parameters to invoke the EDF fos_reverse :*/
-                                anEDF_for_solverx_p->dpp_U=xNew<double>(weightNum,anEDF_for_solverx_p->max_m);
-                                anEDF_for_solverx_p->dpp_Z=xNew<double>(weightNum,anEDF_for_solverx_p->max_n);
 
                                 /*seed matrix: */
@@ -331 +316 @@
                         else _error_("driver: " << driver << " not yet supported!");
 
-                        /* delete the allocated space for the parameters:*/
-                        xDelete(anEDF_for_solverx_p->dp_x);
-                        xDelete(anEDF_for_solverx_p->dp_X);
-                        xDelete(anEDF_for_solverx_p->dpp_X);
-                        xDelete(anEDF_for_solverx_p->dp_y);
-                        xDelete(anEDF_for_solverx_p->dp_Y);
-                        xDelete(anEDF_for_solverx_p->dpp_Y);
-                        xDelete(anEDF_for_solverx_p->dp_U);
-                        xDelete(anEDF_for_solverx_p->dpp_U);
-                        xDelete(anEDF_for_solverx_p->dp_Z);
-                        xDelete(anEDF_for_solverx_p->dpp_Z);
 
                         if(VerboseAutodiff())_printf0_("   end AD core\n");

issm/trunk-jpl/src/c/shared/Numerics/isnan.h

@@ -13 +13 @@
 
 /*If include cmath instead of math, isnan on linux64 murdo does not work: */
-#include <math.h>
+#include <cmath>
 
 template <class T> int xIsNan(const T& X) {
@@ -19 +19 @@
                 return (X!=X)?1:0;
 #else
-                return isnan(X);
+                return std::isnan(X);
 #endif
 }

issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp

@@ -232 +232 @@
         for(int i=0; i<n*n;i++)adoubleEDFin[i]    =A[i];      // pack matrix
         for(int i=0; i<n;  i++)adoubleEDFin[i+n*n]=B[i];      // pack the right hand side
-        IssmPDouble* pdoubleEDFin=xNew<IssmPDouble>(n*(n+1)); // provide space to transfer inputs during call_ext_fct
-        IssmPDouble* pdoubleEDFout=xNew<IssmPDouble>(n);           // provide space to transfer outputs during call_ext_fct
         // call the wrapped solver through the registry entry we retrieve from parameters
         call_ext_fct(xDynamicCast<GenericParam<Adolc_edf> * >(parameters->FindParamObject(AdolcParamEnum))->GetParameterValue().myEDF_for_solverx_p,
-                     n*(n+1), pdoubleEDFin, adoubleEDFin,
-                     n, pdoubleEDFout,X);
+                     n*(n+1), adoubleEDFin,
+                     n, X);
         // for(int i=0; i<n;  i++) {ADOLC_DUMP_MACRO(X[i]);}
         xDelete(adoubleEDFin);
-        xDelete(pdoubleEDFin);
-        xDelete(pdoubleEDFout);
-}
-/*}}}*/
-#endif
+}
+/*}}}*/
+#endif