first commit

Author: moritzdannhauer

src/Core/Algorithms/Legacy/FiniteElements/BuildRHS/BuildFEVolRHS.cc

@@ -26,6 +26,62 @@
    DEALINGS IN THE SOFTWARE.
 */
 
+
+#include <Core/Algorithms/Legacy/FiniteElements/BuildRHS/BuildFEVolRHS.h>
+#include <Core/Datatypes/DenseMatrix.h>
+#include <Core/Datatypes/SparseRowMatrix.h>
+#include <Core/Thread/Barrier.h>
+#include <Core/Thread/Parallel.h>
+//#include <Core/Geometry/Point.h>
+//#include <Core/Geometry/Tensor.h>
+//#include <Core/Logging/Log.h>
+
+using namespace SCIRun;
+using namespace SCIRun::Core::Geometry;
+using namespace SCIRun::Core::Datatypes;
+using namespace SCIRun::Core::Thread;
+using namespace SCIRun::Core::Algorithms;
+using namespace SCIRun::Core::Algorithms::FiniteElements;
+//using namespace SCIRun::Core::Logging;
+
+AlgorithmInputName BuildFEVolRHSAlgo::Mesh("Mesh");
+AlgorithmInputName BuildFEVolRHSAlgo::Vector_Table("Vector_Table");
+AlgorithmOutputName BuildFEVolRHSAlgo::RHS("RHS");
+
+
+FieldHandle BuildFEVolRHSAlgo::run(FieldHandle input, DenseMatrixHandle ctable) const
+{
+ FieldHandle a;
+ return a;
+}
+
+AlgorithmOutput BuildFEVolRHSAlgo::run_generic(const AlgorithmInput& input) const
+{
+/*  auto field = input.get<Field>(Variables::InputField);
+  auto ctable = input.get<DenseMatrix>(Conductivity_Table);
+
+  SparseRowMatrixHandle stiffness;
+  if (!run(field, ctable, stiffness))
+    THROW_ALGORITHM_PROCESSING_ERROR("False returned on legacy run call.");*/
+
+  AlgorithmOutput output;
+ // output[Stiffness_Matrix] = stiffness;
+  return output;
+}
+
+
+
+
+
+
+
+
+
+
+#ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
+
+
+
 #include <Core/Algorithms/FiniteElements/BuildRHS/BuildFEVolRHS.h>
 
 #include <Core/Datatypes/DenseMatrix.h>
@@ -905,3 +961,6 @@ run(FieldHandle input, MatrixHandle vtable, MatrixHandle& output)
 }
 
 } // end namespace SCIRun
+
+
+#endif

src/Core/Algorithms/Legacy/FiniteElements/BuildRHS/BuildFEVolRHS.h

@@ -26,45 +26,33 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-
 #ifndef CORE_ALGORITHMS_FINITEELEMENTS_BUILDFEVOLRHS_H
 #define CORE_ALGORITHMS_FINITEELEMENTS_BUILDFEVOLRHS_H 1
 
-// Datatypes that the algorithm uses
-#include <Core/Datatypes/Field.h>
-#include <Core/Datatypes/Mesh.h>
-#include <Core/Datatypes/Matrix.h>
-
-// Base class for algorithm
-#include <Core/Algorithms/Util/AlgoBase.h>
-
-// for Windows support
-#include <Core/Algorithms/FiniteElements/share.h>
+#include <Core/Datatypes/MatrixFwd.h>
+#include <Core/Algorithms/Base/AlgorithmBase.h>
+#include <vector>
+#include <Core/Algorithms/Legacy/FiniteElements/share.h>
 
-namespace SCIRunAlgo {
+namespace SCIRun {
+	namespace Core {
+		namespace Algorithms {
+			namespace FiniteElements {
 
-using namespace SCIRun;
-
-class SCISHARE BuildFEVolRHSAlgo : public AlgoBase
+class SCISHARE BuildFEVolRHSAlgo : public AlgorithmBase
 {
   public:
-    BuildFEVolRHSAlgo()
-    { 
-      // Number of processors to use
-      add_int("num_processors",-1);
-      
-      // Store intermediate results to speed up computation for
-      // for instance vector search
-      // This option only works for an indexed vector table
-      add_bool("generate_basis",false);
-    }
-    
-    bool run(FieldHandle input,
-             MatrixHandle vtable,
-             MatrixHandle& output);
+
+    static AlgorithmInputName Mesh;
+    static AlgorithmInputName Vector_Table;
+    static AlgorithmOutputName RHS;
+
+   FieldHandle run(FieldHandle input, Datatypes::DenseMatrixHandle ctable) const;  
+   virtual AlgorithmOutput run_generic(const AlgorithmInput &) const;
+private:
 
 };
 
-} // end namespace SCIRun
+}}}}
 
-#endif 
+#endif

src/Core/Algorithms/Legacy/FiniteElements/CMakeLists.txt

@@ -30,6 +30,7 @@
 SET(Core_Algorithms_Legacy_FiniteElements_HEADERS
   BuildMatrix/BuildTDCSMatrix.h
   BuildMatrix/BuildFEMatrix.h
+  BuildRHS/BuildFEVolRHS.h
 )
 
 # Sources of Core/Algorithms/Legacy/FiniteElements classes
@@ -39,7 +40,7 @@ SET(Core_Algorithms_Legacy_FiniteElements_SRCS
   #Mapping/BuildNodeLink.cc
   BuildMatrix/BuildFEMatrix.cc
   BuildMatrix/BuildTDCSMatrix.cc
-  #BuildRHS/BuildFEVolRHS.cc
+  BuildRHS/BuildFEVolRHS.cc
   #BuildRHS/BuildFESurfRHS.cc
 )
 

src/Modules/Legacy/FiniteElements/BuildFEVolRHS.cc

@@ -27,6 +27,74 @@
 */
 /// @todo Documentation Modules/Legacy/FiniteElements/BuildFEVolRHS.cc
 
+#ifdef SCIRUN4_ESSENTIAL_CODE_TO_BE_PORTED
+ #include <Core/Datatypes/SparseRowMatrix.h>
+ #include <Core/Datatypes/DenseMatrix.h>
+ #include <Core/Datatypes/Matrix.h>
+ #include <Core/Datatypes/Field.h>
+ #include <Core/Datatypes/MatrixTypeConverter.h>
+
+ #include <Dataflow/Network/Ports/MatrixPort.h>
+ #include <Dataflow/Network/Ports/FieldPort.h>
+ #include <Dataflow/GuiInterface/GuiVar.h>
+ #include <Dataflow/Network/Module.h>
+#endif
+
+//#include <Core/Algorithms/FiniteElements/BuildRHS/BuildFEVolRHS.h>
+#include <Core/Datatypes/Legacy/Field/Field.h>
+#include <Modules/Legacy/FiniteElements/BuildFEVolRHS.h>
+
+
+using namespace SCIRun::Modules::FiniteElements;
+using namespace SCIRun::Dataflow::Networks;
+//using namespace SCIRun::Core::Datatypes;
+//using namespace SCIRun::Core::Algorithms;
+using namespace SCIRun;
+
+BuildFEVolRHSModule::BuildFEVolRHSModule()
+  : Module(ModuleLookupInfo("BuildFEVolRHSModule", "FiniteElements", "SCIRun"), false)
+{
+  INITIALIZE_PORT(Mesh);
+  INITIALIZE_PORT(Vector_Table);
+  INITIALIZE_PORT(RHS);
+}
+
+void BuildFEVolRHSModule::execute()
+{
+ /* 
+#ifdef SCIRUN4_ESSENTIAL_CODE_TO_BE_PORTED  
+  FieldHandle Field;
+  MatrixHandle VectorTable;
+  MatrixHandle RHSMatrix;
+  
+  if (!(get_input_handle("Mesh",Field,true))) return;
+  get_input_handle("Vector Table", VectorTable, false);
+  
+  if (inputs_changed_ || gui_use_basis_.changed() || !oport_cached("RHS") )
+  {
+    algo_.set_bool("generate_basis",gui_use_basis_.get());
+    if(!(algo_.run(Field,VectorTable,RHSMatrix))) return;
+    
+    send_output_handle("RHS", RHSMatrix);
+  }
+#endif  
+  
+  auto mesh = getRequiredInput(Mesh);
+  auto vectorTable = getRequiredInput(Vector_Table);
+  
+  if (needToExecute())
+  {
+    Core::Algorithms::AlgorithmOutput output; //= algo().run_generic(withInputData((Mesh, mesh)(Vector_Table, vectorTable)));
+    sendOutputFromAlgorithm(RHS, output);
+  }
+ */ 
+}
+
+
+
+#ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
+
+
 #include <Core/Datatypes/SparseRowMatrix.h>
 #include <Core/Datatypes/DenseMatrix.h>
 #include <Core/Datatypes/Matrix.h>
@@ -88,5 +156,5 @@ void BuildFEVolRHS::execute()
 
 } // End namespace SCIRun
 
-
+#endif
 

src/Modules/Legacy/FiniteElements/BuildFEVolRHS.h

@@ -0,0 +1,60 @@
+ 
+/*
+   For more information, please see: http://software.sci.utah.edu
+
+   The MIT License
+
+   Copyright (c) 2009 Scientific Computing and Imaging Institute,
+   University of Utah.
+
+   
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+*/
+/// @todo Documentation Modules/Legacy/FiniteElements/BuildFEVolRHSModule.h
+
+#ifndef MODULES_LEGACY_FINITEELEMENTS_BuildFEVolRHSModule_H__
+#define MODULES_LEGACY_FINITEELEMENTS_BuildFEVolRHSModule_H__
+
+#include <Dataflow/Network/Module.h>
+#include <Modules/Legacy/FiniteElements/share.h>
+
+namespace SCIRun {
+  namespace Modules {
+    namespace FiniteElements {
+
+      class SCISHARE BuildFEVolRHSModule : public Dataflow::Networks::Module,
+        public Has2InputPorts<FieldPortTag, MatrixPortTag>,
+        public Has1OutputPort<FieldPortTag>
+      {
+      public:
+        BuildFEVolRHSModule();
+        virtual void setStateDefaults() {}
+        virtual void execute();
+
+        INPUT_PORT(0, Mesh, LegacyField);
+        INPUT_PORT(1, Vector_Table, Matrix);
+        OUTPUT_PORT(0, RHS, LegacyField);
+
+      };
+
+    }
+  }
+}
+
+#endif

src/Modules/Legacy/FiniteElements/CMakeLists.txt

@@ -31,6 +31,7 @@
 SET(Modules_Legacy_FiniteElements_HEADERS
   BuildFEMatrix.h
   BuildTDCSMatrix.h
+  BuildFEVolRHS.h
 )
 
 SET(Modules_Legacy_FiniteElements_SRCS
@@ -40,7 +41,7 @@ SET(Modules_Legacy_FiniteElements_SRCS
   BuildFEMatrix.cc
   BuildTDCSMatrix.cc
   #BuildFESurfRHS.cc
-  #BuildFEVolRHS.cc
+  BuildFEVolRHS.cc
 )
 
 SCIRUN_ADD_LIBRARY(Modules_Legacy_FiniteElements