Changeset 21569

Timestamp:

02/21/17 17:43:58 (8 years ago)

Author:

glperez

Message:

FIX: Fixing 'isnan' issue in AD and Getting a Specific Version of Adjoinable MPI

Location:

issm/trunk-jpl

Files:

• externalpackages/adjoinablempi/install.sh (modified) (1 diff)
• src/c/solutionsequences/solutionsequence_linear.cpp (modified) (1 diff)

issm/trunk-jpl/externalpackages/adjoinablempi/install.sh

@@ -6 +6 @@
 
 #Mercurial cloning: 
-hg clone http://mercurial.mcs.anl.gov//ad/AdjoinableMPI src
+hg clone -r 268 http://mercurial.mcs.anl.gov//ad/AdjoinableMPI src
 
 #Configure adjoinablempi

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp

@@ -47 +47 @@
         nF=pf->Norm(NORM_TWO);
         solver_residue=nKUF/nF;
-        if(isnan(solver_residue_threshold) == false && solver_residue>solver_residue_threshold)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
+
+#ifdef _HAVE_ADOLC_
+        if(!isnan(solver_residue_threshold.getValue()) && solver_residue>solver_residue_threshold)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
+#else
+        if(!isnan(solver_residue_threshold) && solver_residue>solver_residue_threshold)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
+#endif
+
 
         //clean up