Merge pull request #71 from OptimalDesignLab/miso-merge

With minimal changes, all tests passed and optimization works fine

Author: jehicken

src/common/data_logging.hpp

@@ -120,10 +120,13 @@ class ParaViewLogger
                   double time,
                   int rank)
    {
-      fields.at(fieldname)->SetFromTrueDofs(state);
-      pv.SetCycle(timestep);
-      pv.SetTime(time);
-      pv.Save();
+      if (fields.count(fieldname) > 0)
+      {
+         fields.at(fieldname)->SetFromTrueDofs(state);
+         pv.SetCycle(timestep);
+         pv.SetTime(time);
+         pv.Save();
+      }
    }
 
    void registerField(const std::string &name, mfem::ParGridFunction &field)

src/physics/CMakeLists.txt

@@ -27,10 +27,10 @@ target_sources(miso
       ${MISO_PHYSICS_HEADERS}
 )
 
-# get_target_property(MACH_PUBLIC_HEADERS mach PUBLIC_HEADER)
-# set(MACH_PUBLIC_HEADERS ${MACH_PUBLIC_HEADERS} ${MACH_PHYSICS_HEADERS})
-# set_target_properties(mach PROPERTIES
-#    PUBLIC_HEADER "${MACH_PUBLIC_HEADERS}"
+# get_target_property(MISO_PUBLIC_HEADERS miso PUBLIC_HEADER)
+# set(MISO_PUBLIC_HEADERS ${MISO_PUBLIC_HEADERS} ${MISO_PHYSICS_HEADERS})
+# set_target_properties(miso PROPERTIES
+#    PUBLIC_HEADER "${MISO_PUBLIC_HEADERS}"
 # )
 
 add_public_headers_to_target(miso "${MISO_PHYSICS_HEADERS}")

src/physics/thermal/temp_integ.hpp

@@ -2,7 +2,6 @@
 #define MISO_TEMP_INTEGRATOR
 
 #include "mfem.hpp"
-//#include "solver.hpp"
 
 namespace miso
 {