Merge pull request #100 from wenqing/misc

Re-organized some includes and removed pieces of unused code
ufz · Jun 14, 2018 · 7cdc408 · 7cdc408
2 parents b8f3286 + 211ee22
commit 7cdc408
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 2,654 deletions.
diff --git a/FEM/fem_ele.cpp b/FEM/fem_ele.cpp
@@ -22,6 +22,10 @@
 #include "femlib.h"
 #include "mathlib.h"
 
+#ifndef USE_PETSC
+#include "par_ddc.h"
+#endif
+
 #include "ShapeFunctionPool.h"
 
 namespace FiniteElement

diff --git a/FEM/fem_ele.h b/FEM/fem_ele.h
@@ -17,15 +17,10 @@
 
 #define fem_INC
 
-// C++
-//#include <vector>
-//#include <string>
-
-#if defined(USE_PETSC) // || defined(other parallel libs)//03.3012. WW
 #include "prototyp.h"
-#else
-// MSH
-#include "par_ddc.h" //OK //Moved from fem_ele_std.h. WW
+
+#ifndef USE_PETSC
+class CPARDomain;
 #endif
 
 #include "MSHEnums.h"

diff --git a/FEM/fem_ele_std.cpp b/FEM/fem_ele_std.cpp
@@ -50,6 +50,10 @@
 using Math_Group::CSparseMatrix;
 #endif
 
+#ifndef USE_PETSC
+#include "par_ddc.h"
+#endif
+
 #ifdef OGS_USE_CVODE
 extern "C" {
 #include <cvode/cvode.h> /* prototypes for CVODE fcts., consts. */

diff --git a/FEM/fem_ele_vec.cpp b/FEM/fem_ele_vec.cpp
@@ -35,6 +35,11 @@
 #include "equation_class.h"
 using Math_Group::CSparseMatrix;
 #endif
+
+#ifndef USE_PETSC
+#include "par_ddc.h"
+#endif
+
 //
 #define COMP_MOL_MASS_AIR 28.96 // kg/kmol WW  28.96
 #define GAS_CONSTANT 8314.41 // J/(kmol*K) WW