diff --git a/applications/solvers/solidMechanics/Allwclean b/applications/solvers/solidMechanics/Allwclean deleted file mode 100755 index 4ccd3a3bd..000000000 --- a/applications/solvers/solidMechanics/Allwclean +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -x - -wclean solidModels - -wclean elasticContactSolidFoam -wclean elasticContactIncrSolidFoam -wclean elasticContactNonLinULSolidFoam -wclean elasticGravitySolidFoam -wclean elasticIncrSolidFoam -wclean elasticNonLinTLSolidFoam -wclean elasticNonLinULSolidFoam -wclean elasticPlasticSolidFoam -wclean elasticPlasticNonLinULSolidFoam -wclean elasticSolidFoam -wclean elasticThermalSolidFoam -wclean icoFsiElasticNonLinULSolidFoam -wclean viscoElasticSolidFoam - -(cd utilities && ./Allwclean) \ No newline at end of file diff --git a/applications/solvers/solidMechanics/Allwmake b/applications/solvers/solidMechanics/Allwmake deleted file mode 100755 index dfaf332f6..000000000 --- a/applications/solvers/solidMechanics/Allwmake +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -x - -wmake libso solidModels - -wmake elasticContactSolidFoam -wmake elasticContactIncrSolidFoam -wmake elasticContactNonLinULSolidFoam -wmake elasticGravitySolidFoam -wmake elasticIncrSolidFoam -wmake elasticNonLinTLSolidFoam -wmake elasticNonLinULSolidFoam -wmake elasticPlasticNonLinULSolidFoam -wmake elasticPlasticSolidFoam -wmake elasticSolidFoam -wmake elasticThermalSolidFoam -wmake icoFsiElasticNonLinULSolidFoam -wmake viscoElasticSolidFoam - -(cd utilities && ./Allwmake) \ No newline at end of file diff --git a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/Make/files index 8d2447f0d..baa815f3a 100644 --- a/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticContactIncrSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticContactIncrSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticContactIncrSolidFoam +EXE = $(FOAM_APPBIN)/elasticContactIncrSolidFoam diff --git a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/Make/files index 2a5fe7169..73ee646f2 100644 --- a/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticContactNonLinULSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticContactNonLinULSolidFoam +EXE = $(FOAM_APPBIN)/elasticContactNonLinULSolidFoam diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/files index c27d16b32..250b16ddc 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticContactSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticContactSolidFoam +EXE = $(FOAM_APPBIN)/elasticContactSolidFoam diff --git a/applications/solvers/solidMechanics/elasticGravitySolidFoam/Make/files b/applications/solvers/solidMechanics/elasticGravitySolidFoam/Make/files index b63eb42ef..faf6080e9 100644 --- a/applications/solvers/solidMechanics/elasticGravitySolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticGravitySolidFoam/Make/files @@ -1,3 +1,3 @@ elasticGravitySolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticGravitySolidFoam \ No newline at end of file +EXE = $(FOAM_APPBIN)/elasticGravitySolidFoam \ No newline at end of file diff --git a/applications/solvers/solidMechanics/elasticIncrSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticIncrSolidFoam/Make/files index b0b8f7cae..9b534fceb 100644 --- a/applications/solvers/solidMechanics/elasticIncrSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticIncrSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticIncrSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticIncrSolidFoam \ No newline at end of file +EXE = $(FOAM_APPBIN)/elasticIncrSolidFoam \ No newline at end of file diff --git a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/Make/files index b259d855e..52d1f96af 100644 --- a/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticNonLinTLSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticNonLinTLSolidFoam \ No newline at end of file +EXE = $(FOAM_APPBIN)/elasticNonLinTLSolidFoam \ No newline at end of file diff --git a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/Make/files index 445b1c01f..4d09a2532 100644 --- a/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticNonLinULSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticNonLinULSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticNonLinULSolidFoam +EXE = $(FOAM_APPBIN)/elasticNonLinULSolidFoam diff --git a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/Make/files index e83f108b0..9bf3d9d55 100644 --- a/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticPlasticNonLinULSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticPlasticNonLinULSolidFoam +EXE = $(FOAM_APPBIN)/elasticPlasticNonLinULSolidFoam diff --git a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/Make/files index 3f5286e9d..037ae4523 100644 --- a/applications/solvers/solidMechanics/elasticPlasticSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticPlasticSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticPlasticSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticPlasticSolidFoam +EXE = $(FOAM_APPBIN)/elasticPlasticSolidFoam diff --git a/applications/solvers/solidMechanics/elasticSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticSolidFoam/Make/files index 00fd67089..718b86973 100644 --- a/applications/solvers/solidMechanics/elasticSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticSolidFoam \ No newline at end of file +EXE = $(FOAM_APPBIN)/elasticSolidFoam \ No newline at end of file diff --git a/applications/solvers/solidMechanics/elasticThermalSolidFoam/Make/files b/applications/solvers/solidMechanics/elasticThermalSolidFoam/Make/files index db70a8a9b..631447c3e 100644 --- a/applications/solvers/solidMechanics/elasticThermalSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/elasticThermalSolidFoam/Make/files @@ -1,3 +1,3 @@ elasticThermalSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/elasticThermalSolidFoam \ No newline at end of file +EXE = $(FOAM_APPBIN)/elasticThermalSolidFoam \ No newline at end of file diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/files b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/files index f67b20209..35b64665e 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/files @@ -2,4 +2,4 @@ icoFsiElasticNonLinULSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/icoFsiElasticNonLinULSolidFoam \ No newline at end of file +EXE = $(FOAM_APPBIN)/icoFsiElasticNonLinULSolidFoam \ No newline at end of file diff --git a/applications/solvers/solidMechanics/utilities/Allwclean b/applications/solvers/solidMechanics/utilities/Allwclean deleted file mode 100755 index c90c458b3..000000000 --- a/applications/solvers/solidMechanics/utilities/Allwclean +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -x - -wclean foamMeshToAbaqus -wclean setMatFromCellZones -wclean patchStressIntegrate \ No newline at end of file diff --git a/applications/solvers/solidMechanics/utilities/Allwmake b/applications/solvers/solidMechanics/utilities/Allwmake deleted file mode 100755 index 9a600b9d7..000000000 --- a/applications/solvers/solidMechanics/utilities/Allwmake +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -x - - -wmake foamMeshToAbaqus -wmake setMatFromCellZones -wmake patchStressIntegrate \ No newline at end of file diff --git a/applications/solvers/solidMechanics/utilities/foamMeshToAbaqus/Make/files b/applications/solvers/solidMechanics/utilities/foamMeshToAbaqus/Make/files deleted file mode 100644 index af4c0d587..000000000 --- a/applications/solvers/solidMechanics/utilities/foamMeshToAbaqus/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -foamMeshToAbaqus.C - -EXE = $(FOAM_USER_APPBIN)/foamMeshToAbaqus diff --git a/applications/solvers/solidMechanics/utilities/patchStressIntegrate/Make/files b/applications/solvers/solidMechanics/utilities/patchStressIntegrate/Make/files deleted file mode 100644 index 6372e696b..000000000 --- a/applications/solvers/solidMechanics/utilities/patchStressIntegrate/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -patchStressIntegrate.C - -EXE = $(FOAM_USER_APPBIN)/patchStressIntegrate \ No newline at end of file diff --git a/applications/solvers/solidMechanics/utilities/setMatFromCellZones/Make/files b/applications/solvers/solidMechanics/utilities/setMatFromCellZones/Make/files deleted file mode 100644 index 500ce9bf3..000000000 --- a/applications/solvers/solidMechanics/utilities/setMatFromCellZones/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -setMatFromCellZones.C - -EXE = $(FOAM_USER_APPBIN)/setMatFromCellZones \ No newline at end of file diff --git a/applications/solvers/solidMechanics/viscoElasticSolidFoam/Make/files b/applications/solvers/solidMechanics/viscoElasticSolidFoam/Make/files index a120346b4..7799bf7d1 100644 --- a/applications/solvers/solidMechanics/viscoElasticSolidFoam/Make/files +++ b/applications/solvers/solidMechanics/viscoElasticSolidFoam/Make/files @@ -1,3 +1,3 @@ viscoElasticSolidFoam.C -EXE = $(FOAM_USER_APPBIN)/viscoElasticSolidFoam +EXE = $(FOAM_APPBIN)/viscoElasticSolidFoam diff --git a/applications/utilities/mesh/conversion/foamMeshToAbaqus/Make/files b/applications/utilities/mesh/conversion/foamMeshToAbaqus/Make/files new file mode 100644 index 000000000..dd626a5c5 --- /dev/null +++ b/applications/utilities/mesh/conversion/foamMeshToAbaqus/Make/files @@ -0,0 +1,3 @@ +foamMeshToAbaqus.C + +EXE = $(FOAM_APPBIN)/foamMeshToAbaqus diff --git a/applications/solvers/solidMechanics/utilities/foamMeshToAbaqus/Make/options b/applications/utilities/mesh/conversion/foamMeshToAbaqus/Make/options similarity index 100% rename from applications/solvers/solidMechanics/utilities/foamMeshToAbaqus/Make/options rename to applications/utilities/mesh/conversion/foamMeshToAbaqus/Make/options diff --git a/applications/solvers/solidMechanics/utilities/foamMeshToAbaqus/foamMeshToAbaqus.C b/applications/utilities/mesh/conversion/foamMeshToAbaqus/foamMeshToAbaqus.C similarity index 100% rename from applications/solvers/solidMechanics/utilities/foamMeshToAbaqus/foamMeshToAbaqus.C rename to applications/utilities/mesh/conversion/foamMeshToAbaqus/foamMeshToAbaqus.C diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H index 1dc4d152a..950422057 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H +++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H @@ -86,6 +86,7 @@ class mergePolyMesh //- Cell zones DynamicList