From d37378acf4b9b389973f18dc4282e40ee8bc4de4 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 21 Sep 2009 18:20:03 +0200 Subject: [PATCH] relocate autoMesh -> mesh/autoMesh --- .../utilities/mesh/generation/snappyHexMesh/Make/options | 2 +- src/Allwmake | 2 +- src/mesh/Allwmake | 1 + src/{ => mesh}/autoMesh/Make/files | 0 src/{ => mesh}/autoMesh/Make/options | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H | 0 .../autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C | 0 .../autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C | 0 .../autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H | 0 .../autoHexMeshDriver/layerParameters/layerParameters.C | 0 .../autoHexMeshDriver/layerParameters/layerParameters.H | 0 .../autoHexMesh/autoHexMeshDriver/pointData/pointData.C | 0 .../autoHexMesh/autoHexMeshDriver/pointData/pointData.H | 0 .../autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H | 0 .../refinementParameters/refinementParameters.C | 0 .../refinementParameters/refinementParameters.H | 0 .../autoHexMeshDriver/snapParameters/snapParameters.C | 0 .../autoHexMeshDriver/snapParameters/snapParameters.H | 0 .../autoMesh/autoHexMesh/meshRefinement/meshRefinement.C | 0 .../autoMesh/autoHexMesh/meshRefinement/meshRefinement.H | 0 .../autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C | 0 .../autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C | 0 .../autoHexMesh/meshRefinement/meshRefinementProblemCells.C | 0 .../autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C | 0 .../autoHexMesh/meshRefinement/meshRefinementTemplates.C | 0 .../autoHexMesh/refinementSurfaces/refinementSurfaces.C | 0 .../autoHexMesh/refinementSurfaces/refinementSurfaces.H | 0 .../autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C | 0 .../autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H | 0 .../autoMesh/autoHexMesh/trackedParticle/ExactParticle.C | 0 .../autoMesh/autoHexMesh/trackedParticle/ExactParticle.H | 0 .../autoMesh/autoHexMesh/trackedParticle/trackedParticle.C | 0 .../autoMesh/autoHexMesh/trackedParticle/trackedParticle.H | 0 .../autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C | 0 40 files changed, 3 insertions(+), 2 deletions(-) rename src/{ => mesh}/autoMesh/Make/files (100%) rename src/{ => mesh}/autoMesh/Make/options (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H (100%) rename src/{ => mesh}/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C (100%) diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index 1c74c3aff5..e6db59c825 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ /* -g -DFULLDEBUG -O0 */ \ -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \ - -I$(LIB_SRC)/autoMesh/lnInclude \ + -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ diff --git a/src/Allwmake b/src/Allwmake index acbc2c3f0f..36950bed15 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -50,9 +50,9 @@ turbulenceModels/Allwmake lagrangian/Allwmake postProcessing/Allwmake conversion/Allwmake +mesh/Allwmake mesh/Allwmake -wmake libso autoMesh wmake libso errorEstimation fvAgglomerationMethods/Allwmake diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake index 06493bb893..f967335db3 100755 --- a/src/mesh/Allwmake +++ b/src/mesh/Allwmake @@ -2,6 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x +wmake libso autoMesh wmake libso blockMesh # ----------------------------------------------------------------- end-of-file diff --git a/src/autoMesh/Make/files b/src/mesh/autoMesh/Make/files similarity index 100% rename from src/autoMesh/Make/files rename to src/mesh/autoMesh/Make/files diff --git a/src/autoMesh/Make/options b/src/mesh/autoMesh/Make/options similarity index 100% rename from src/autoMesh/Make/options rename to src/mesh/autoMesh/Make/options diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H similarity index 100% rename from src/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H rename to src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C similarity index 100% rename from src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C rename to src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H similarity index 100% rename from src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H rename to src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C similarity index 100% rename from src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C rename to src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C similarity index 100% rename from src/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C rename to src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementMerge.C diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C similarity index 100% rename from src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C rename to src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C similarity index 100% rename from src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C rename to src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C similarity index 100% rename from src/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C rename to src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C similarity index 100% rename from src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C rename to src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H similarity index 100% rename from src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H rename to src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H diff --git a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C similarity index 100% rename from src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C rename to src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C diff --git a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H b/src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H similarity index 100% rename from src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H rename to src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.H diff --git a/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C similarity index 100% rename from src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C rename to src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.C diff --git a/src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H similarity index 100% rename from src/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H rename to src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H diff --git a/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C similarity index 100% rename from src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C rename to src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C diff --git a/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H similarity index 100% rename from src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H rename to src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H diff --git a/src/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C similarity index 100% rename from src/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C rename to src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C