modularity

modules/slimFunction/slimTpxo.h

 #ifndef _SLIM_TPXO_H_
 #define _SLIM_TPXO_H_
-#include "dgConfig.h"
 #include "slimStructData.h"
 #include "dgDofContainer.h"
 #include "dgGroupOfElements.h"

modules/slimIce/CMakeLists.txt

@@ -4,14 +4,16 @@ set(SRC
   slimLim.cpp
 )
 
+set(LIBS "")
+
 option(ENABLE_LIM "Enable Lim" OFF)
 if(ENABLE_LIM)
   add_subdirectory(LIM3)
   dg_set_module_option(HAVE_LIM "Lim")
-  dg_add_library("${CMAKE_CURRENT_BINARY_DIR}/LIM3/libLIM.a")
-  dg_add_library("${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}")
+  list(APPEND LIBS "${CMAKE_CURRENT_BINARY_DIR}/LIM3/libLIM.a")
+  list(APPEND LIBS "${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}")
 endif(ENABLE_LIM)
 
-dg_add_module(dgSlimIce "${SRC}")
+dg_add_module(dgSlimIce "${SRC}" "${LIBS}")
 dg_add_swig_module(slimIce slimIce.i dgSlimIce)
 #dg_add_test_directory(tests alice.pestiaux@uclouvain.be)

modules/subsurface/CMakeLists.txt

@@ -9,6 +9,6 @@ set(SRC
   dgTermControlVolumeFE.cpp
 )
 
-dg_add_module(dgSubSurface "${SRC}")
+dg_add_module(dgSubSurface "${SRC}" "")
 dg_add_swig_module(subsurface subsurface.i dgSubSurface)
 dg_add_test_directory(tests thomas.demaet@uclouvain.be)

modules/supra/CMakeLists.txt

@@ -3,6 +3,6 @@ set(SRC
   dgConservationLawCurlCurlDiffusion.cpp
 )
 
-dg_add_module(dgSupra "${SRC}")
+dg_add_module(dgSupra "${SRC}" "")
 dg_add_swig_module(supra supra.i dgSupra)
 dg_add_test_directory(tests abelin.kameni@lgep.supelec.fr)

modules/sweNonHydro/CMakeLists.txt

@@ -6,6 +6,6 @@ set(SRC
   sweNonHydro_h.cpp
 )
 
-dg_add_module(dgSweNonHydro "${SRC}")
+dg_add_module(dgSweNonHydro "${SRC}" "")
 dg_add_swig_module(sweNonHydro sweNonHydro.i dgSweNonHydro)
 #dg_add_test_directory(tests sebastien.blaise@uclouvain.be)

modules/wave/CMakeLists.txt

@@ -5,6 +5,6 @@ set(SRC
   dgPmlParameters.cpp
 )
 
-dg_add_module(dgWave "${SRC}")
+dg_add_module(dgWave "${SRC}" "")
 dg_add_swig_module(wave wave.i dgWave)
 dg_add_test_directory(tests axel.modave@gmail.com)

tools/dgMessage.cpp

@@ -8,6 +8,7 @@
 #if defined(HAVE_PETSC)
 #include "petsc.h"
 #endif
+#include "mpi.h"
 int Msg::_commRank = 0;
 int Msg::_commSize = 1;