MRBF enabling working with scalar DOF

examples/CMakeLists.txt

@@ -97,6 +97,7 @@ if(BUILD_EXAMPLES)
         list(APPEND EXAMPLE_LIST "utils_example_00002")
         list(APPEND EXAMPLE_LIST "utils_example_00004")
         list(APPEND EXAMPLE_LIST "utils_example_00005")
+        list(APPEND EXAMPLE_LIST "manipulators_example_00008")
         if(MODULE_GEOHANDLERS_ENABLED)
             list(APPEND EXAMPLE_LIST "utils_example_00003")
         endif()
@@ -174,6 +175,11 @@ if(BUILD_EXAMPLES)
         COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../geodata/spherepc_binary.vtu" "${CMAKE_CURRENT_BINARY_DIR}/geodata/spherepc_binary.vtu"
         COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../input/manipulators_input_00005.txt" "${CMAKE_CURRENT_BINARY_DIR}/input/manipulators_input_00005.txt"
     )
+    add_custom_command(
+        TARGET "manipulators_example_00008" PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../geodata/pipeSample.vtu" "${CMAKE_CURRENT_BINARY_DIR}/geodata/pipeSample.vtu"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../input/manipulators_input_00008.txt" "${CMAKE_CURRENT_BINARY_DIR}/input/manipulators_input_00008.txt"
+    )
 
     list(FIND EXAMPLE_LIST "manipulators_example_00006" _index)
     if ( ${_index} GREATER -1)

examples/manipulators_example_00007.cpp

@@ -148,7 +148,7 @@ void test00007() {
     mimmo::pin::addPin(input, pointcloud, M_DISPLS, M_DISPLS);
     mimmo::pin::addPin(inputSR, pointcloud, M_DATAFIELD, M_DATAFIELD);
     mimmo::pin::addPin(pointcloud, proj, M_GEOM, M_GEOM2);
-    mimmo::pin::addPin(pointcloud, mrbf, M_SCALARFIELD, M_SCALARFIELD);
+    mimmo::pin::addPin(pointcloud, mrbf, M_SCALARFIELD, M_SCALARFIELD2);
     mimmo::pin::addPin(pointcloud, mrbf, M_VECTORFIELD, M_VECTORFIELD);
     mimmo::pin::addPin(proj, mrbf, M_GEOM, M_GEOM2);
     mimmo::pin::addPin(mrbf, applier, M_GDISPLS, M_GDISPLS);

examples/manipulators_example_00008.cpp

@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+ *
+ *  mimmo
+ *
+ *  Copyright (C) 2015-2017 OPTIMAD engineering Srl
+ *
+ *  -------------------------------------------------------------------------
+ *  License
+ *  This file is part of mimmo.
+ *
+ *  mimmo is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU Lesser General Public License v3 (LGPL)
+ *  as published by the Free Software Foundation.
+ *
+ *  mimmo is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ *  License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with mimmo. If not, see <http://www.gnu.org/licenses/>.
+ *
+ \ *---------------------------------------------------------------------------*/
+
+#include "mimmo_manipulators.hpp"
+#include "mimmo_iogeneric.hpp"
+#include "mimmo_utils.hpp"
+#include <random>
+#if MIMMO_ENABLE_MPI
+    #include "mimmo_parallel.hpp"
+#endif
+
+// =================================================================================== //
+/*!
+	\example manipulators_example_00008.cpp
+
+	\brief Example of usage of radial basis function MRBF block employing scalar input dofs to retrieve
+    an output scalar field on the geometry. The field will be interpreted as the entity of displacement
+    on the local normal and will be applied to geometry to obtain the final deformation.
+    Nodal RBF are distributed on surface with CreateSeedsOnSurface block.
+
+    Geometry deformation block used: MRBF/CreateSeedsOnSurface.
+
+	<b>To run</b>: ./manipulators_example_00008 \n
+
+	<b> visit</b>: <a href="http://optimad.github.io/mimmo/">mimmo website</a> \n
+ */
+
+void test00008() {
+
+    /* Creation of mimmo containers.
+     * Input and output MimmoGeometry are instantiated
+     * as two different objects (no loop in chain are permitted).
+     */
+    mimmo::MimmoGeometry * mimmo0 = new mimmo::MimmoGeometry(mimmo::MimmoGeometry::IOMode::CONVERT);
+    mimmo0->setReadDir("geodata");
+    mimmo0->setReadFileType(FileType::SURFVTU);
+    mimmo0->setReadFilename("pipeSample");
+    mimmo0->setWriteDir(".");
+    mimmo0->setWriteFileType(FileType::SURFVTU);
+    mimmo0->setWriteFilename("manipulators_output_00008.0000");
+
+
+    mimmo::MimmoGeometry * mimmo1 = new mimmo::MimmoGeometry(mimmo::MimmoGeometry::IOMode::WRITE);
+    mimmo1->setWriteDir(".");
+    mimmo1->setWriteFileType(FileType::SURFVTU);
+    mimmo1->setWriteFilename("manipulators_output_00008.0001");
+
+
+#if MIMMO_ENABLE_MPI
+    /* Creation of a Partition object.
+    */
+    mimmo::Partition* partition= new mimmo::Partition();
+    partition->setPartitionMethod(mimmo::PartitionMethod::PARTGEOM);
+    partition->setPlotInExecution(true);
+#endif
+
+    /* Seed 10 3D points on the surface, acting as RBF point cloud.
+       Using a CreateSeedsOnSurface block.
+    */
+    mimmo::CreateSeedsOnSurface * seeder = new mimmo::CreateSeedsOnSurface();
+    seeder->setNPoints(10);
+    seeder->setEngineENUM(mimmo::CSeedSurf::RANDOM);
+    seeder->setMassCenterAsSeed(true);
+    seeder->setRandomFixed(true);
+    seeder->setRandomSignature(12457834);
+    seeder->setPlotInExecution(true);
+
+    /* Read Dof for RBF Cloud for plain txt file.
+       For each node is associated a scalar DOF, in order to obtain a "scalar"
+       field of displacements from MRBF
+     */
+    mimmo::GenericInput* inputDof = new mimmo::GenericInput(true, false);
+    inputDof->setReadDir("input");
+    inputDof->setFilename("manipulators_input_00008.txt");
+
+    /* Instantiation of a MRBF object with a distribution of 10 nodes from CreateSeedsOnSurface
+     * and scalar DOF coming from inputDOF
+     * Plot Optional results during execution active for MRBF block.
+     */
+    mimmo::MRBF* mrbf = new mimmo::MRBF(mimmo::MRBFSol::NONE);
+    mrbf->setFunction(bitpit::RBFBasisFunction::C1C2);
+    mrbf->setSupportRadiusReal(0.6);
+    mrbf->setPlotInExecution(true);
+
+    /* Create applier block.
+     * It applies the MRBF output scalar field onto the original input geometry, using
+       the local vertex normals of the original geometry.
+     */
+    mimmo::Apply* applier = new mimmo::Apply();
+
+    /* Setup pin connections.
+     */
+#if MIMMO_ENABLE_MPI
+    mimmo::pin::addPin(mimmo0, partition, M_GEOM, M_GEOM);
+    mimmo::pin::addPin(partition, seeder, M_GEOM, M_GEOM);
+    mimmo::pin::addPin(partition, mrbf, M_GEOM, M_GEOM);
+    mimmo::pin::addPin(partition, applier, M_GEOM, M_GEOM);
+#else
+    mimmo::pin::addPin(mimmo0, seeder, M_GEOM, M_GEOM);
+    mimmo::pin::addPin(mimmo0, mrbf, M_GEOM, M_GEOM);
+    mimmo::pin::addPin(mimmo0, applier, M_GEOM, M_GEOM);
+#endif
+
+    mimmo::pin::addPin(inputDof, mrbf, M_DATAFIELD, M_DATAFIELD);
+    mimmo::pin::addPin(seeder, mrbf, M_COORDS, M_COORDS);
+    mimmo::pin::addPin(mrbf, applier, M_SCALARFIELD, M_SCALARFIELD);
+    mimmo::pin::addPin(applier, mimmo1, M_GEOM, M_GEOM);
+
+    /* Setup execution chain.
+     * The object can be insert in the chain in random order.
+     * The chain object recover the correct order of execution from
+     * the pin connections.
+     */
+    mimmo::Chain ch0;
+    ch0.addObject(inputDof);
+#if MIMMO_ENABLE_MPI
+    ch0.addObject(partition);
+#endif
+    ch0.addObject(mimmo0);
+    ch0.addObject(seeder);
+    ch0.addObject(applier);
+    ch0.addObject(mrbf);
+    ch0.addObject(mimmo1);
+
+    /* Execution of chain.
+     * Use debug flag true to print out the execution steps.
+     */
+    ch0.exec(true);
+
+    /* Clean up & exit;
+     */
+    delete mrbf;
+    delete seeder;
+    delete applier;
+    delete inputDof;
+    delete mimmo0;
+    delete mimmo1;
+#if MIMMO_ENABLE_MPI
+    delete partition;
+#endif
+
+    return;
+}
+
+int	main( int argc, char *argv[] ) {
+
+    BITPIT_UNUSED(argc);
+    BITPIT_UNUSED(argv);
+
+#if MIMMO_ENABLE_MPI
+    MPI_Init(&argc, &argv);
+#endif
+        try{
+            /**<Calling mimmo Test routine*/
+            test00008() ;
+        }
+        catch(std::exception & e){
+            std::cout<<"manipulators_example_00008 exited with an error of type : "<<e.what()<<std::endl;
+            return 1;
+        }
+#if MIMMO_ENABLE_MPI
+    MPI_Finalize();
+#endif
+
+    return 0;
+}

input/manipulators_input_00008.txt

@@ -0,0 +1 @@
+0.061451 0.00463127 0.0162127 -0.073378 -0.06235 -0.0729379 0.000221809 0.04535834 -0.0422825 -0.0352695

src/common/portDefinitions.hpp

@@ -50,6 +50,7 @@
 #define M_FILTER          "M_FILTER"            /**< Port dedicated to communication of a scalar field used as a filter function [ POINTER to MimmoPiercedVector < double > ] */
 #define M_FILTER2         "M_FILTER2"            /**< Port dedicated to communication of a scalar field used as a filter function [ POINTER to MimmoPiercedVector < double > ] */
 #define M_DATAFIELD       "M_DATAFIELD"         /**< Port dedicated to communication of a generic scalar field [ std::vector<double>] */
+#define M_DATAFIELD2      "M_DATAFIELD2"         /**< Port dedicated to communication of a generic scalar field [ std::vector<double>] */
 #define M_VECTORSI        "M_VECTORSI"          /**< Port dedicated to communication of a generic list of short integers [ vector < short int > ] */
 #define M_VECTORLI        "M_VECTORLI"          /**< Port dedicated to communication of a generic list of long integers [ vector < long int > ] */
 #define M_VECTORLI2       "M_VECTORLI2"         /**< Port dedicated to communication of a generic list of long integers [ vector < long int > ] */

src/core/SkdTreeUtils.cpp

@@ -773,6 +773,17 @@ void signedGlobalDistance(int nP, const std::array<double,3> *points, const bitp
 
     int nProcessors = spatch.getProcessorCount();
 
+    if (nProcessors == 1 && shared){
+        for (int ip = 0; ip < nP; ip++){
+            const long & cellId = ids[ip];
+            double & distance = distances[ip];
+            double & s = signs[ip];
+            if(cellId != bitpit::Cell::NULL_ID){
+                distance *= s;
+            }
+        }
+    }
+
     if (nProcessors > 1 && spatch.isCommunicatorSet()){
         if (shared){
 

src/manipulators/Apply.cpp

@@ -397,6 +397,7 @@ Apply::checkInput(){
 		check = check && m_scalarinput.getGeometry() == m_geometry;
 		check = check && m_scalarinput.completeMissingData(0.0);
 		if (check){
+            m_geometry->updateAdjacencies();
 			bitpit::SurfaceKernel* skernel = static_cast<bitpit::SurfaceKernel*>(m_geometry->getPatch());
 			bitpit::PiercedVector<darray3E> vNormals;
 			bitpit::ConstProxyVector<long> verts;