ENH: Relocated AMI functionality and components

src/AMIInterpolation/Make/files

@@ -1,27 +0,0 @@
-AMIInterpolation/AMIInterpolationName.C
-faceAreaIntersect/faceAreaIntersect.C
-
-CYCPATCHES=patches/cyclic
-$(CYCPATCHES)/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
-$(CYCPATCHES)/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C
-$(CYCPATCHES)/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
-$(CYCPATCHES)/cyclicAMIFvPatch/cyclicAMIFvPatch.C
-$(CYCPATCHES)/cyclicAMIFvPatchField/cyclicAMIFvPatchFields.C
-$(CYCPATCHES)/cyclicAMIFvsPatchField/cyclicAMIFvsPatchFields.C
-$(CYCPATCHES)/cyclicAMIPointPatch/cyclicAMIPointPatch.C
-
-MAPPATCHES=patches/mapped
-$(MAPPATCHES)/mappedPolyPatch/mappedPatchBase.C
-$(MAPPATCHES)/mappedPolyPatch/mappedPolyPatch.C
-$(MAPPATCHES)/mappedPolyPatch/mappedWallPolyPatch.C
-$(MAPPATCHES)/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
-$(MAPPATCHES)/mappedPolyPatch/mappedWallPointPatch.C
-$(MAPPATCHES)/mappedFvPatch/mappedFvPatch.C
-$(MAPPATCHES)/mappedFvPatch/mappedWallFvPatch.C
-$(MAPPATCHES)/mappedFixedValue/mappedFixedValueFvPatchFields.C
-$(MAPPATCHES)/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.C
-$(MAPPATCHES)/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C
-
-$(MAPPATCHES)/mappedField/mappedFieldFvPatchFields.C
-
-LIB = $(FOAM_LIBBIN)/libAMIInterpolation

src/AMIInterpolation/Make/options

@@ -1,11 +0,0 @@
-EXE_INC = \
-    -DFULLDEBUG -g -O0 \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
-
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lsampling

src/Allwmake

@@ -50,8 +50,6 @@ wmake $makeType conversion
 
 wmake $makeType sampling
 
-wmake $makeType AMIInterpolation
-
 wmake $makeType dynamicMesh
 wmake $makeType dynamicFvMesh
 wmake $makeType topoChangerFvMesh

src/finiteVolume/Make/files

@@ -17,6 +17,7 @@ $(basicFvPatches)/generic/genericFvPatch.C
 
 constraintFvPatches = $(fvPatches)/constraint
 $(constraintFvPatches)/cyclic/cyclicFvPatch.C
+$(constraintFvPatches)/cyclicAMI/cyclicAMIFvPatch.C
 $(constraintFvPatches)/cyclicSlip/cyclicSlipFvPatch.C
 $(constraintFvPatches)/empty/emptyFvPatch.C
 $(constraintFvPatches)/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C
@@ -27,6 +28,8 @@ $(constraintFvPatches)/wedge/wedgeFvPatch.C
 
 derivedFvPatches = $(fvPatches)/derived
 $(derivedFvPatches)/wall/wallFvPatch.C
+$(derivedFvPatches)/mapped/mappedFvPatch.C
+$(derivedFvPatches)/mapped/mappedWallFvPatch.C
 $(derivedFvPatches)/directMapped/directMappedFvPatch.C
 $(derivedFvPatches)/directMapped/directMappedWallFvPatch.C
 
@@ -98,6 +101,7 @@ $(basicFvPatchFields)/zeroGradient/zeroGradientFvPatchFields.C
 
 constraintFvPatchFields = $(fvPatchFields)/constraint
 $(constraintFvPatchFields)/cyclic/cyclicFvPatchFields.C
+$(constraintFvPatchFields)/cyclicAMI/cyclicAMIFvPatchFields.C
 $(constraintFvPatchFields)/cyclicSlip/cyclicSlipFvPatchFields.C
 $(constraintFvPatchFields)/empty/emptyFvPatchFields.C
 $(constraintFvPatchFields)/jumpCyclic/jumpCyclicFvPatchFields.C
@@ -115,6 +119,10 @@ $(derivedFvPatchFields)/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorFi
 $(derivedFvPatchFields)/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/advective/advectiveFvPatchFields.C
 $(derivedFvPatchFields)/codedFixedValue/codedFixedValueFvPatchFields.C
+$(derivedFvPatchFields)/mappedField/mappedFieldFvPatchFields.C
+$(derivedFvPatchFields)/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.C
+$(derivedFvPatchFields)/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C
+$(derivedFvPatchFields)/mappedFixedValue/mappedFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/directMappedField/directMappedFieldFvPatchFields.C
 $(derivedFvPatchFields)/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C
 $(derivedFvPatchFields)/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.C

src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C

@@ -28,8 +28,7 @@ License
 #include "indexedOctree.H"
 #include "meshTools.H"
 #include "mergePoints.H"
-
+#include "mapDistribute.H"
-#include "vtkSurfaceWriter.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -240,7 +239,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::distributePatches
 
             str >> faces[domain]
                 >> points[domain]
-                >> faceIDs[domain]; 
+                >> faceIDs[domain];
         }
     }
 }
@@ -1213,7 +1212,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
         // Rework newTgtPatch indices into globalIndices of tgtPatch
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    
+
         forAll(srcAddress_, i)
         {
             labelList& addressing = srcAddress_[i];
@@ -1498,6 +1497,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::writeWeights
 )
 const
 {
+/*
     static label i = 0;
 
     scalarField wghtSum(weights.size(), 0.0);
@@ -1523,6 +1523,7 @@ const
     );
 
     i++;
+*/
 }
 
 
@@ -1535,6 +1536,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::writePatch
 )
 const
 {
+/*
     static label i = 0;
 
     vtkSurfaceWriter writer;
@@ -1551,6 +1553,7 @@ const
     );
 
     i++;
+*/
 }
 
 

src/meshTools/Make/files

@@ -164,6 +164,20 @@ directMapped/directMappedPolyPatch/directMappedVariableThicknessWallPolyPatch.C
 directMapped/directMappedPointPatch/directMappedPointPatch.C
 directMapped/directMappedPointPatch/directMappedWallPointPatch.C
 
+AMI=AMIInterpolation
+$(AMI)/AMIInterpolation/AMIInterpolationName.C
+$(AMI)/faceAreaIntersect/faceAreaIntersect.C
+
+AMICycPatches=$(AMI)/patches/cyclic
+$(AMICycPatches)/cyclicAMILduInterfaceField/cyclicAMILduInterface.C
+$(AMICycPatches)/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C
+$(AMICycPatches)/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+
+mappedPatches/mappedPolyPatch/mappedPatchBase.C
+mappedPatches/mappedPolyPatch/mappedPolyPatch.C
+mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
+mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
+mappedPatches/mappedPolyPatch/mappedWallPointPatch.C
 
 
 LIB = $(FOAM_LIBBIN)/libmeshTools

src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H

@@ -337,7 +337,7 @@ public:
                 }
             }
         }
-  
+
 
         //- Return reference to the parallel distribution map
         const mapDistribute& map() const