From: Jean-Paul Pelteret Date: Sat, 23 May 2020 15:53:12 +0000 (+0200) Subject: Update to deal.II 9.1: Ceres X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14a1a76d2472c8e2b95a5d8b26964ac6ac7815f8;p=code-gallery.git Update to deal.II 9.1: Ceres --- diff --git a/CeresFE/CMakeLists.txt b/CeresFE/CMakeLists.txt index bfdce11..7a1fb94 100644 --- 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 1ab413d..9a9045d 100644 --- a/CeresFE/src/ceres.cc +++ b/CeresFE/src/ceres.cc @@ -74,7 +74,10 @@ One per plasticity step: #include #include #include + +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include +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(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]);