GIT: interfaceTracking: relocate library

applications/solvers/incompressible/pimpleFoam/Make/options

@@ -7,8 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/interfaceTrackingFvMesh/lnInclude
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -21,5 +20,4 @@ EXE_LIBS = \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
-    -latmosphericModels \
-    -linterfaceTrackingFvMesh
+    -latmosphericModels

applications/utilities/finiteArea/checkFaMesh/Make/options

@@ -6,4 +6,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteArea \
     -lfiniteVolume \
-    -lmeshTools \
+    -lmeshTools

src/Allwmake

@@ -113,7 +113,7 @@ wmake $targetType optimisation/adjointOptimisation/adjoint
 
 
 # interfaceTracking libs
-wmake dynamicFvMesh/interfaceTrackingFvMesh
+dynamicFaMesh/Allwmake $targetType $*
 
 
 # Needs access to Turbulence

src/dynamicFaMesh/Allwmake

+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+
+#------------------------------------------------------------------------------
+
+wmake $targetType interfaceTrackingFvMesh
+
+#------------------------------------------------------------------------------

src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C → src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C

@@ -5,8 +5,6 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
     Copyright (C) 2019 Zeljko Tukovic, FSB Zagreb.
 -------------------------------------------------------------------------------
 License

src/dynamicFvMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H → src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H

@@ -5,7 +5,6 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2013-2016 OpenFOAM Foundation
     Copyright (C) 2019 Zeljko Tukovic, FSB Zagreb.
 -------------------------------------------------------------------------------
 License

tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/dynamicMeshDict

@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dynamicFvMesh   interfaceTrackingFvMesh;
+motionSolverLibs (fvMotionSolvers interfaceTrackingFvMesh);
 
-motionSolverLibs (fvMotionSolvers);
+dynamicFvMesh   interfaceTrackingFvMesh;
 
 motionSolver    velocityLaplacian;
 

tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/constant/faMesh/faMeshDefinition

@@ -32,7 +32,7 @@ boundary
     }
     frontAndBack
     {
-        type                patch;
+        type                empty;
         ownerPolyPatch      top;
         neighbourPolyPatch  frontAndBack;
     }

tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/system/controlDict

@@ -15,6 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Currently optional dependency for pimpleFoam
+libs            (interfaceTrackingFvMesh);
+
 application     pimpleFoam;
 
 startFrom       startTime;

tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/constant/dynamicMeshDict

@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+motionSolverLibs (fvMotionSolvers interfaceTrackingFvMesh);
+
 dynamicFvMesh   interfaceTrackingFvMesh;
 
 motionSolver    velocityLaplacian;

tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/makePerturbation/Make/options

@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/interfaceTrackingFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicFaMesh/interfaceTrackingFvMesh/lnInclude \
 
 EXE_LIBS = \
     -ldynamicFvMesh \

tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/system/controlDict

@@ -15,6 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Currently optional dependency for pimpleFoam
+libs            (interfaceTrackingFvMesh);
+
 application     pimpleFoam;
 
 startFrom       startTime;

tutorials/incompressible/pimpleFoam/laminar/sloshing2D/constant/dynamicMeshDict

@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dynamicFvMesh   interfaceTrackingFvMesh;
+motionSolverLibs (fvMotionSolvers interfaceTrackingFvMesh);
 
-motionSolverLibs (fvMotionSolvers);
+dynamicFvMesh   interfaceTrackingFvMesh;
 
 motionSolver    velocityLaplacian;
 

tutorials/incompressible/pimpleFoam/laminar/sloshing2D/makeWave/Make/options

@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/interfaceTrackingFvMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicFaMesh/interfaceTrackingFvMesh/lnInclude \
 
 EXE_LIBS = \
     -ldynamicFvMesh \

tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict

@@ -15,6 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Currently optional dependency for pimpleFoam
+libs            (interfaceTrackingFvMesh);
+
 application     pimpleFoam;
 
 startFrom       startTime;