Update to deal.II 9.1: Ceres

diff --git a/CeresFE/CMakeLists.txt b/CeresFE/CMakeLists.txt
index bfdce11c9147a4b577c444d73d4991c11ceb8807..7a1fb94fde13905d3c1ea8f5ff9b170bebb05162 100644 (file)
--- a/CeresFE/CMakeLists.txt
+++ b/CeresFE/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)
 
-FIND_PACKAGE(deal.II 9.0 QUIET
+FIND_PACKAGE(deal.II 9.1 QUIET
   HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
   )
 

diff --git a/CeresFE/src/ceres.cc b/CeresFE/src/ceres.cc
index 1ab413d8a6b3329431d7c7567e05862e4a632358..9a9045d15e35412a041d0d9c6d7acc3d43b274ad 100644 (file)
--- a/CeresFE/src/ceres.cc
+++ b/CeresFE/src/ceres.cc
@@ -74,7 +74,10 @@ One per plasticity step:
 #include <string>
 #include <time.h>
 #include <math.h>
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #include <armadillo>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #include "../support_code/ellipsoid_grav.h"
 #include "../support_code/ellipsoid_fit.h"
@@ -223,7 +226,7 @@ namespace Step22
     Assert(component < this->n_components,
            ExcIndexRange (component, 0, this->n_components));
 
-    Assert(p[0] >= -10, ExcLowerRange (p[0], 0)); //value of -10 is to permit some small numerical error moving nodes left of x=0; a << value is in fact sufficient
+    Assert(p[0] >= -10.0, ExcLowerRangeType<double>(p[0], -10.0)); //value of -10 is to permit some small numerical error moving nodes left of x=0; a << value is in fact sufficient
 
     return 0;
   }
@@ -2159,7 +2162,7 @@ int main(int argc, char *argv[])
 
   if (argc == 1) // if no input parameters (as if launched from eclipse)
     {
-      std::strcpy(cfg_filename,"config/ConfigurationV2.cfg");
+      std::strcpy(cfg_filename,"config/sample_CeresFE_config.cfg");
     }
   else
     std::strcpy(cfg_filename,argv[1]);