Merge pull request #1346 from mfem/hotfix-4.1

mfem-4.1 hotfixes [hotfix-4.1]
mfem · Mar 11, 2020 · 8dbbcfc · 8dbbcfc
2 parents d9c4909 + 6641bd7
commit 8dbbcfc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/miniapps/electromagnetics/joule.cpp b/miniapps/electromagnetics/joule.cpp
@@ -120,6 +120,10 @@ static double mj_ = 0.0;
 static double sj_ = 0.0;
 static double wj_ = 0.0;
 
+// Initialize variables used in joule_solver.cpp
+int electromagnetics::SOLVER_PRINT_LEVEL = 0;
+int electromagnetics::STATIC_COND        = 0;
+
 int main(int argc, char *argv[])
 {
    // 1. Initialize MPI.

diff --git a/miniapps/electromagnetics/joule_solver.hpp b/miniapps/electromagnetics/joule_solver.hpp
@@ -27,10 +27,11 @@ namespace electromagnetics
 {
 
 // Some global variable for convenience
-static const double      SOLVER_TOL = 1.0e-9;
-static const int      SOLVER_MAX_IT = 1000;
-static       int SOLVER_PRINT_LEVEL = 0;
-static       int        STATIC_COND = 0;
+const double       SOLVER_TOL = 1.0e-9;
+const int       SOLVER_MAX_IT = 1000;
+// Initialized in joule.cpp and used in joule_solver.cpp:
+extern int SOLVER_PRINT_LEVEL;
+extern int        STATIC_COND;
 
 // These are defined in joule.cpp
 void edot_bc(const Vector &x, Vector &E);

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -148,7 +148,7 @@ if (MFEM_USE_MPI)
       target_compile_definitions(psedov_tests_cuda PUBLIC MFEM_SEDOV_DEVICE="cuda")
       target_link_libraries(psedov_tests_cuda mfem)
 
-      add_executable(psedov_tests_cuda_uvm ${SEDOV_TESTS_SRCS})
+      add_executable(psedov_tests_cuda_uvm ${PAR_SEDOV_TESTS_SRCS})
       target_compile_definitions(psedov_tests_cuda_uvm PUBLIC MFEM_SEDOV_MPI=1)
       target_compile_definitions(psedov_tests_cuda_uvm PUBLIC MFEM_SEDOV_TESTS=1)
       target_compile_definitions(psedov_tests_cuda_uvm PUBLIC MFEM_SEDOV_DEVICE="cuda:uvm")

diff --git a/tests/unit/makefile b/tests/unit/makefile
@@ -73,7 +73,8 @@ punit_tests: $(PAR_MAIN_OBJ) $(OBJECT_FILES) $(MFEM_LIB_FILE) $(CONFIG_MK) $(DAT
 
 # Note: in this rule, we always use the full path to the source file as a
 # workaround for an issue with coveralls.
-%.o: $(SRC)%.cpp $(HEADER_FILES) $(CONFIG_MK)
+$(OBJECT_FILES) $(SEQ_MAIN_OBJ) $(PAR_MAIN_OBJ): %.o: $(SRC)%.cpp \
+ $(HEADER_FILES) $(CONFIG_MK)
 	@mkdir -p $(@D)
 	$(CCC) -c $(abspath $(<)) $(MFEM_FLAGS) $(INCLUDES) -o $(@)