Work towards VSRC2013 compilation.

Author: l-korous

CMakeLists.txt

@@ -265,9 +265,9 @@ project(hermes)
   # This overrides CXX flags for MSVC
   if(MSVC)
     if(WIN64)
-      set(MSVC_DEFINES "/DWIN64 /D_WINDOWS /Dpopen=_popen /Dpclose=_pclose /D__value=_value /Dfinite=_finite /Dhypot=_hypot /Disatty=_isatty /Dfileno=_fileno /D_CRT_SECURE_NO_WARNINGS /DYY_NO_UNISTD_H /D_USE_MATH_DEFINES /DIMPLEMENT_C99 /wd4275 /wd4251")
+      set(MSVC_DEFINES "/DWIN64 /D_WINDOWS /Dfinite=_finite /wd4275 /wd4251")
     else(WIN64)
-      set(MSVC_DEFINES "/DWIN32 /D_WINDOWS /Dpopen=_popen /Dpclose=_pclose /D__value=_value /Dfinite=_finite /Dhypot=_hypot /Disatty=_isatty /Dfileno=_fileno /D_CRT_SECURE_NO_WARNINGS /DYY_NO_UNISTD_H /D_USE_MATH_DEFINES /DIMPLEMENT_C99 /wd4275 /wd4251")
+      set(MSVC_DEFINES "/DWIN32 /D_WINDOWS /Dfinite=_finite /wd4275 /wd4251")
     endif(WIN64)
     set(CMAKE_CXX_FLAGS_DEBUG          "/D_DEBUG /Od /Ob2 /MDd /Zi ${MSVC_DEFINES}")
     set(HERMES_DEBUG_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")

hermes2d/src/solver/linear_solver.cpp

@@ -101,7 +101,7 @@ namespace Hermes
       {
         this->info("\tLinearSolver: reusing Matrix, assembling RHS.");
         this->dp->assemble(coeff_vec, this->get_residual());
-        this->linear_matrix_solver->set_reuse_scheme(HERMES_REUSE_MATRIX_STRUCTURE_COMPLETELY);
+        this->linear_matrix_solver->set_reuse_scheme(Hermes::Solvers::HERMES_REUSE_MATRIX_STRUCTURE_COMPLETELY);
       }
       else
       {
@@ -110,7 +110,7 @@ namespace Hermes
         else
           this->info("\tLinearSolver: calculating the Matrix.");
         this->dp->assemble(coeff_vec, this->get_jacobian(), this->get_residual());
-        this->linear_matrix_solver->set_reuse_scheme(HERMES_CREATE_STRUCTURE_FROM_SCRATCH);
+        this->linear_matrix_solver->set_reuse_scheme(Hermes::Solvers::HERMES_CREATE_STRUCTURE_FROM_SCRATCH);
       }
 
       this->process_matrix_output(this->get_jacobian(), 1);

hermes2d/test_examples/03-navier-stokes/main.cpp

@@ -162,7 +162,7 @@ int main(int argc, char* argv[])
     coeff_vec, Hermes::vector<NormType>(vel_proj_norm, vel_proj_norm, p_proj_norm));
 
   newton.set_max_allowed_iterations(max_allowed_iterations);
-  newton.set_tolerance(NEWTON_TOL, ResidualNormAbsolute);
+  newton.set_tolerance(NEWTON_TOL, Hermes::Solvers::ResidualNormAbsolute);
   newton.set_sufficient_improvement_factor_jacobian(1e-2);
   //newton.set_jacobian_constant();
 

hermes2d/test_examples/08-nonlinearity/main.cpp

@@ -68,7 +68,7 @@ int main(int argc, char* argv[])
 
   // Initialize Newton solver.
   NewtonSolver<double> newton(&dp);
-  newton.set_tolerance(NEWTON_TOL, ResidualNormAbsolute);
+  newton.set_tolerance(NEWTON_TOL, Hermes::Solvers::ResidualNormAbsolute);
   newton.set_max_allowed_residual_norm(1e99);
   newton.set_max_allowed_iterations(NEWTON_MAX_ITER);
 
@@ -89,22 +89,6 @@ int main(int argc, char* argv[])
   {
     newton.solve(coeff_vec);
   }
-  catch(Hermes::Exceptions::NonlinearException& e)
-  {
-    switch(e.get_exception_state())
-    {
-       case AboveMaxIterations:
-         std::cout << std::endl << "\t\t\tAboveMaxIterations" << std::endl;
-         break;
-      case BelowMinDampingCoeff:
-        std::cout << std::endl << "\t\t\tBelowMinDampingCoeff" << std::endl;
-         break;
-      case AboveMaxAllowedResidualNorm:
-        std::cout << std::endl << "\t\t\tAboveMaxAllowedResidualNorm" << std::endl;
-         break;
-    }
-  }
-  
   catch(std::exception& e)
   {
     std::cout << e.what();

hermes2d/test_examples/12-picard/main.cpp

@@ -87,7 +87,7 @@ int main(int argc, char* argv[])
   picard.use_Anderson_acceleration(false);
 
   // Perform the Picard's iteration (Anderson acceleration on by default).
-  picard.set_tolerance(1e-7, SolutionChangeRelative);
+  picard.set_tolerance(1e-7, Hermes::Solvers::SolutionChangeRelative);
   picard.set_max_allowed_iterations(PICARD_MAX_ITER);
   picard.set_num_last_vector_used(PICARD_NUM_LAST_ITER_USED);
   picard.set_anderson_beta(PICARD_ANDERSON_BETA);

hermes_common/CMakeLists.txt

@@ -33,7 +33,6 @@ project(hermes_common)
     src/algebra/cs_matrix.cpp
     src/util/callstack.cpp
     src/util/qsort.cpp
-    src/util/c99_functions.cpp
     src/data_structures/range.cpp
     src/data_structures/table.cpp
     src/solvers/matrix_solver.cpp
@@ -63,7 +62,6 @@ project(hermes_common)
     include/ord.h
     include/hermes_function.h
     include/exceptions.h
-    include/util/c99_functions.h
     include/util/compat.h
     include/util/callstack.h
     include/util/qsort.h
@@ -142,7 +140,6 @@ project(hermes_common)
     "Source Files\\Utilities" FILES 
     src/util/callstack.cpp
     src/util/qsort.cpp
-    src/util/c99_functions.cpp
   )
 
   SOURCE_GROUP(
@@ -191,7 +188,6 @@ project(hermes_common)
 
   SOURCE_GROUP(
     "Header Files\\Utilities" FILES 
-    include/util/c99_functions.h
     include/util/compat.h
     include/util/callstack.h
     include/util/qsort.h

hermes_common/include/hermes_function.h

@@ -34,8 +34,8 @@ namespace Hermes
   /// {
   /// /// Constructor.
   ///&nbsp;MyRealSinSquared() : Hermes1DFunction<double>() {}
-  ///&nbsp;double value(double x) const { return std::sin(x) * std::sin(x); }
-  ///&nbsp;Ord ord(Hermes::Ord x) const { return std::sin(x) * std::sin(x); // Hermes::Ord arithmetics will take care of everything, the resulting order will be as high as possible, see other examples in this file for another possibility how to go about it. }
+  ///&nbsp;double value(double x) const { return sin(x) * sin(x); }
+  ///&nbsp;Ord ord(Hermes::Ord x) const { return sin(x) * sin(x); // Hermes::Ord arithmetics will take care of everything, the resulting order will be as high as possible, see other examples in this file for another possibility how to go about it. }
   ///&nbsp;....
   /// }
   template<typename Scalar>

hermes_common/include/util/c99_functions.h

@@ -70,17 +70,6 @@ FILE *fmemopen (void *buf, size_t size, const char *opentype);
 #define strcasecmp strcmp
 #endif
 
-//C99 functions
-#include "util/c99_functions.h"
-
-// Microsoft does not recognize long double and handles it just like double.
-#ifdef _MSC_VER
-  #ifdef strtold
-    #undef strtold
-  #endif
-  #define strtold strtod
-#endif
-
 #ifdef __GNUC__
   #define NORETURN __attribute__((noreturn))
 #else