Merge branch 'master' into master

Author: dcwhite

src/CMakeLists.txt

@@ -213,7 +213,7 @@ set (cxxfeaturelist ${CMAKE_CXX_COMPILE_FEATURES})
 
 list (FIND cxxfeaturelist "cxx_thread_local" _index)
 if (${_index} GREATER -1)
-  message("Found cxx_thread_local")
+  #message("Found cxx_thread_local")
 else()
   message(WARNING "Did NOT find cxx_thread_local--turning off feature of spdlog")
   add_definitions(-DDISABLE_SPDLOG_TLS=1)

src/Core/Algorithms/Factory/HardCodedAlgorithmFactory.cc

@@ -182,7 +182,7 @@ void HardCodedAlgorithmFactory::addToMakerMap()
       ADD_MODULE_ALGORITHM(ExtractSimpleIsosurface, ExtractSimpleIsosurfaceAlgo)
 	    ADD_MODULE_ALGORITHM(RegisterWithCorrespondences, RegisterWithCorrespondencesAlgo)
       ADD_MODULE_ALGORITHM(ComputePCA, ComputePCAAlgo)
-      ADD_MODULE_ALGORITHM(ExtractSimpleIsosurface, ExtractSimpleIsosurfaceAlgo)
+      ADD_MODULE_ALGORITHM(ExtractIsosurface, ExtractSimpleIsosurfaceAlgo)
 	    ADD_MODULE_ALGORITHM(RegisterWithCorrespondences, RegisterWithCorrespondencesAlgo)
       ADD_MODULE_ALGORITHM(ClipVolumeByIsovalue, ClipMeshByIsovalueAlgo)
       ADD_MODULE_ALGORITHM(RefineTetMeshLocally, RefineTetMeshLocallyAlgorithm)

src/Core/Algorithms/Legacy/Fields/Mapping/MapFieldDataFromSourceToDestination.cc

@@ -72,6 +72,7 @@ namespace detail
       sfield_(0), dfield_(0), smesh_(0), dmesh_(0), maxdist_(0), algo_(0),
       barrier_(name, nproc), nproc_(nproc) {}
 
+    virtual ~MapFieldDataFromSourceToDestinationPAlgoBase() {}
     virtual void parallel(int proc) = 0;
 
     VField* sfield_;

src/Core/Algorithms/Legacy/Fields/MeshDerivatives/ExtractSimpleIsosurfaceAlgo.cc

@@ -50,6 +50,9 @@ ALGORITHM_PARAMETER_DEF(Fields, Isovalues);
 ALGORITHM_PARAMETER_DEF(Fields, SingleIsoValue);
 ALGORITHM_PARAMETER_DEF(Fields, IsovalueChoice);
 ALGORITHM_PARAMETER_DEF(Fields, IsovalueListInclusiveExclusive);
+ALGORITHM_PARAMETER_DEF(Fields, IsovalueQuantityFromField);
+ALGORITHM_PARAMETER_DEF(Fields, ManualMinimumIsovalue);
+ALGORITHM_PARAMETER_DEF(Fields, ManualMaximumIsovalue);
 ALGORITHM_PARAMETER_DEF(Fields, ListOfIsovalues);
 ALGORITHM_PARAMETER_DEF(Fields, QuantityOfIsovalues);
 ALGORITHM_PARAMETER_DEF(Fields, IsovalueListString);
@@ -61,6 +64,9 @@ ExtractSimpleIsosurfaceAlgo::ExtractSimpleIsosurfaceAlgo()
   addParameter(Parameters::IsovalueListInclusiveExclusive, 0);
   addParameter(Parameters::ListOfIsovalues, std::string());
   addParameter(Parameters::QuantityOfIsovalues, 1);
+  addParameter(Parameters::IsovalueQuantityFromField, 1);
+  addParameter(Parameters::ManualMaximumIsovalue, 0.0);
+  addParameter(Parameters::ManualMinimumIsovalue, 0.0);
   addOption(Parameters::IsovalueChoice, "Single", "Single|List|Quantity");
 }
 
@@ -89,7 +95,7 @@ AlgorithmOutput ExtractSimpleIsosurfaceAlgo::run(const AlgorithmInput& input) co
 
   if (!run(field, iso_value_vector, output_field))
     THROW_ALGORITHM_PROCESSING_ERROR("False returned on legacy run call.");
-  
+
   DenseMatrixHandle output_matrix( new DenseMatrix(iso_value_vector.size(),1,0.0));
   for (size_t k=0;k<iso_value_vector.size();k++) {(*output_matrix)(k,0) = iso_value_vector[k];}
 

src/Core/Algorithms/Legacy/Fields/MeshDerivatives/ExtractSimpleIsosurfaceAlgo.h

@@ -43,6 +43,9 @@ namespace Fields {
   ALGORITHM_PARAMETER_DECL(ListOfIsovalues);
   ALGORITHM_PARAMETER_DECL(QuantityOfIsovalues);
   ALGORITHM_PARAMETER_DECL(IsovalueListInclusiveExclusive);
+  ALGORITHM_PARAMETER_DECL(IsovalueQuantityFromField);
+  ALGORITHM_PARAMETER_DECL(ManualMinimumIsovalue);
+  ALGORITHM_PARAMETER_DECL(ManualMaximumIsovalue);
   ALGORITHM_PARAMETER_DECL(Isovalues);
   ALGORITHM_PARAMETER_DECL(IsovalueChoice);
   ALGORITHM_PARAMETER_DECL(IsovalueListString);