diff --git a/src/AMIInterpolation/Make/files b/src/AMIInterpolation/Make/files deleted file mode 100644 index 3b1ab86881..0000000000 --- a/src/AMIInterpolation/Make/files +++ /dev/null @@ -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 diff --git a/src/AMIInterpolation/Make/options b/src/AMIInterpolation/Make/options deleted file mode 100644 index b1bf11173c..0000000000 --- a/src/AMIInterpolation/Make/options +++ /dev/null @@ -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 diff --git a/src/Allwmake b/src/Allwmake index 3089d8fbec..aa17b418e3 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -50,8 +50,6 @@ wmake $makeType conversion wmake $makeType sampling -wmake $makeType AMIInterpolation - wmake $makeType dynamicMesh wmake $makeType dynamicFvMesh wmake $makeType topoChangerFvMesh diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index 7064a73b94..0681e20f70 100644 --- a/src/finiteVolume/Make/files +++ b/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 diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchField.C rename to src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchField.H rename to src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFields.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchFields.C rename to src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFields.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFields.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchFields.H rename to src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFields.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFieldsFwd.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatchField/cyclicAMIFvPatchFieldsFwd.H rename to src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchFieldsFwd.H diff --git a/src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchField.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C diff --git a/src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchField.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.H diff --git a/src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFields.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchFields.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFields.C diff --git a/src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFields.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchFields.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFields.H diff --git a/src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFieldsFwd.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedField/mappedFieldFvPatchFieldsFwd.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchFieldsFwd.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFieldsFwd.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchField.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchField.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFields.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchFields.C rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFields.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFields.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchFields.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFields.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H rename to src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchFieldsFwd.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchField.C rename to src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchField.H rename to src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchField.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFields.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchFields.C rename to src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFields.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchFields.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFields.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchFields.H rename to src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFields.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFieldsFwd.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvsPatchField/cyclicAMIFvsPatchFieldsFwd.H rename to src/finiteVolume/fields/fvsPatchFields/constraint/cyclicAMI/cyclicAMIFvsPatchFieldsFwd.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatch/cyclicAMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatch/cyclicAMIFvPatch.C rename to src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatch/cyclicAMIFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIFvPatch/cyclicAMIFvPatch.H rename to src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedFvPatch.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedFvPatch.C rename to src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedFvPatch.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedFvPatch.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedFvPatch.H rename to src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedFvPatch.H diff --git a/src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedWallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedWallFvPatch.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedWallFvPatch.C rename to src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedWallFvPatch.C diff --git a/src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedWallFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedWallFvPatch.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedFvPatch/mappedWallFvPatch.H rename to src/finiteVolume/fvMesh/fvPatches/derived/mapped/mappedWallFvPatch.H diff --git a/src/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C similarity index 99% rename from src/AMIInterpolation/AMIInterpolation/AMIInterpolation.C rename to src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C index dc056cc9ce..96248f48a6 100644 --- a/src/AMIInterpolation/AMIInterpolation/AMIInterpolation.C +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C @@ -28,8 +28,7 @@ License #include "indexedOctree.H" #include "meshTools.H" #include "mergePoints.H" - -#include "vtkSurfaceWriter.H" +#include "mapDistribute.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -240,7 +239,7 @@ void Foam::AMIInterpolation::distributePatches str >> faces[domain] >> points[domain] - >> faceIDs[domain]; + >> faceIDs[domain]; } } } @@ -1213,7 +1212,7 @@ void Foam::AMIInterpolation::update // Rework newTgtPatch indices into globalIndices of tgtPatch // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - + forAll(srcAddress_, i) { labelList& addressing = srcAddress_[i]; @@ -1498,6 +1497,7 @@ void Foam::AMIInterpolation::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::writePatch ) const { +/* static label i = 0; vtkSurfaceWriter writer; @@ -1551,6 +1553,7 @@ const ); i++; +*/ } diff --git a/src/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H similarity index 100% rename from src/AMIInterpolation/AMIInterpolation/AMIInterpolation.H rename to src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H diff --git a/src/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H similarity index 100% rename from src/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H rename to src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationI.H diff --git a/src/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C similarity index 100% rename from src/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C rename to src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationName.C diff --git a/src/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H similarity index 100% rename from src/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H rename to src/meshTools/AMIInterpolation/AMIInterpolation/AMIPatchToPatchInterpolation.H diff --git a/src/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C similarity index 100% rename from src/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C rename to src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C diff --git a/src/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H similarity index 100% rename from src/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H rename to src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.H diff --git a/src/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H similarity index 100% rename from src/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H rename to src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersectI.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.H rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterface.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMILduInterfaceField/cyclicAMILduInterfaceField.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.C rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.H rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPointPatch/cyclicAMIPointPatch.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchI.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchI.H similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchI.H rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchI.H diff --git a/src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C similarity index 100% rename from src/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C rename to src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index cac3aa685c..ff8c025cd9 100644 --- a/src/meshTools/Make/files +++ b/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 diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPatchBase.C rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H similarity index 99% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPatchBase.H rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H index 4f5194a0a8..34c7fa5479 100644 --- a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPatchBase.H +++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H @@ -337,7 +337,7 @@ public: } } } - + //- Return reference to the parallel distribution map const mapDistribute& map() const diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPolyPatch.C rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedPolyPatch.H rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPointPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPointPatch.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPointPatch.C rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPointPatch.C diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPointPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPointPatch.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPointPatch.H rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPointPatch.H diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPolyPatch.C rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C diff --git a/src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H similarity index 100% rename from src/AMIInterpolation/patches/mapped/mappedPolyPatch/mappedWallPolyPatch.H rename to src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H