More consistent output construction in VtkMappedMeshSource.

- https://github.com/rinkk/ogs/commit/87196737713e4318b54f4ef78aa895f2e432f770
- https://github.com/rinkk/ogs/commit/4b68fd0b93c07d7cb0e9c63fa6f0baa15f2f4247

.idea/codeStyleSettings.xml

@@ -45,6 +45,10 @@
             <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
             <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
           </class>
+          <extensions>
+            <pair source="cpp" header="h" />
+            <pair source="c" header="h" />
+          </extensions>
         </Objective-C-extensions>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />

InSituLib/VtkMappedMeshSource.cpp

@@ -68,12 +68,15 @@ int VtkMappedMeshSource::RequestData(vtkInformation *,
 	if (outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) > 0)
 		return 1;
 
+	// Points
 	this->Points->Reset();
 
 	vtkNew<VtkMeshNodalCoordinatesTemplate<double> > nodeCoords;
 	nodeCoords->SetNodes(_mesh->getNodes());
 	this->Points->SetData(nodeCoords.GetPointer());
+	// output->SetPoints(this->Points.GetPointer()); // TODO: not necessary?
 
+	// Elements
 	vtkNew<VtkMappedMesh> elems;
 	elems->GetImplementation()->SetNodes(_mesh->getNodes());
 	elems->GetImplementation()->SetElements(_mesh->getElements());
@@ -84,6 +87,7 @@ int VtkMappedMeshSource::RequestData(vtkInformation *,
 	output->Allocate(elems->GetNumberOfCells());
 	output->ShallowCopy(elems.GetPointer());
 
+	// Arrays
 	MeshLib::Properties const & properties = _mesh->getProperties();
 	std::vector<std::string> const& propertyNames = properties.getPropertyVectorNames();
 
@@ -100,6 +104,9 @@ int VtkMappedMeshSource::RequestData(vtkInformation *,
 
 		DBUG ("Mesh property \"%s\" with unknown data type.", *name->c_str());
 	}
+
+	output->GetPointData()->ShallowCopy(this->PointData.GetPointer());
+	output->GetCellData()->ShallowCopy(this->CellData.GetPointer());
 	return 1;
 }
 

InSituLib/VtkMappedMeshSource.h

@@ -38,6 +38,7 @@
 #include "MeshLib/Properties.h"
 #include "MeshLib/PropertyVector.h"
 
+class vtkCellData;
 class vtkDataArrayCollection;
 class vtkPointData;
 class vtkPoints;
@@ -87,9 +88,9 @@ private:
 		dataArray->SetName(prop_name.c_str());
 
 		if(propertyVector->getMeshItemType() == MeshLib::MeshItemType::Node)
-			output.GetPointData()->AddArray(dataArray.GetPointer());
+			this->PointData->AddArray(dataArray.GetPointer());
 		else if(propertyVector->getMeshItemType() == MeshLib::MeshItemType::Cell)
-			output.GetCellData()->AddArray(dataArray.GetPointer());
+			this->CellData->AddArray(dataArray.GetPointer());
 
 		return true;
 	}
@@ -103,6 +104,7 @@ private:
 
 	vtkNew<vtkPoints> Points;
 	vtkNew<vtkPointData> PointData;
+	vtkNew<vtkCellData> CellData;
 };
 
 } // Namespace InSituLib

InSituLib/VtkMeshNodalCoordinatesTemplate-impl.h

@@ -194,19 +194,7 @@ template <class Scalar> Scalar& VtkMeshNodalCoordinatesTemplate<Scalar>
 {
 	const vtkIdType tuple = idx / this->NumberOfComponents;
 	const vtkIdType comp = idx % this->NumberOfComponents;
-	switch (comp)
-	{
-		case 0:
-			return (*(*this->_nodes)[tuple])[0];
-		case 1:
-			return (*(*this->_nodes)[tuple])[1];
-		case 2:
-			return (*(*this->_nodes)[tuple])[2];
-		default:
-			vtkErrorMacro(<<"Invalid number of components.");
-			static Scalar dummy(0);
-			return dummy;
-	}
+	return (*(*this->_nodes)[tuple])[comp];
 }
 
 template <class Scalar> void VtkMeshNodalCoordinatesTemplate<Scalar>