STYLE: adjust names, locations for fileFormats

- renamed 'core/' -> 'base/' to avoid gitignore masking when re-adding files - rename 'nas/' to 'nastran/' for more clarity - relocated OBJstream from surfMesh to fileFormats STYLE: remove unused parseNASCoord. Was deprecated 2017-09
2025-11-28 03:28:01 +00:00 · 2020-02-13 13:33:29 +01:00
parent fbb371dda4
commit 4307e1719f
27 changed files with 33 additions and 24 deletions
--- a/applications/test/PatchTools/Make/options
+++ b/applications/test/PatchTools/Make/options
@ -1,7 +1,9 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
-    -lfiniteVolume
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@ -33,11 +33,8 @@ Description

 #include "PatchTools.H"
 #include "argList.H"
-#include "fvMesh.H"
-#include "volFields.H"
 #include "Time.H"
 #include "OBJstream.H"
-#include "fvCFD.H"

 using namespace Foam;

--- a/applications/test/surfaceIntersection/Make/options
+++ b/applications/test/surfaceIntersection/Make/options
@ -1,7 +1,9 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@ -1,5 +1,6 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -8,6 +9,7 @@ EXE_INC = \

 EXE_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools \
    -ldynamicMesh \
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
@ -25,6 +25,8 @@ EXE_INC = \

 LIB_LIBS = \
    ${CGAL_LIBS} \
+    -lfileFormats \
+    -lsurfMesh \
    -lmeshTools \
    -ldecompose \
    -ldynamicMesh \
--- a/applications/utilities/surface/surfaceBooleanFeatures/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/Make/options
@ -16,10 +16,12 @@ EXE_INC = \
    ${CGAL_INC} \
    ${c++CGALWARN} \
    $(COMP_FLAGS) \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools \
    $(LINK_FLAGS)
--- a/applications/utilities/surface/surfaceCheck/Make/options
+++ b/applications/utilities/surface/surfaceCheck/Make/options
@ -1,7 +1,9 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools
--- a/applications/utilities/surface/surfaceInflate/Make/options
+++ b/applications/utilities/surface/surfaceInflate/Make/options
@ -1,7 +1,9 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools
--- a/src/fileFormats/Make/files
+++ b/src/fileFormats/Make/files
@ -25,7 +25,8 @@ $(part)/surface/ensightOutputSurface.C
 ensight/read/ensightReadFile.C
 ensight/type/ensightPTraits.C

-nas/NASCore.C
+nastran/NASCore.C
+obj/OBJstream.C
 fire/FIRECore.C
 starcd/STARCDCore.C
 stl/STLCore.C
@ -34,11 +35,11 @@ stl/STLAsciiParseFlex.L
 stl/STLAsciiParseManual.C
 stl/STLAsciiParseRagel.cc

+vtk/base/foamVtkCore.C
+vtk/base/foamVtkPTraits.C
 vtk/file/foamVtkFileWriter.C
 vtk/file/foamVtkSeriesWriter.C
 vtk/file/foamVtmWriter.C
-vtk/core/foamVtkCore.C
-vtk/core/foamVtkPTraits.C

 vtk/format/foamVtkFormatter.C
 vtk/format/foamVtkAsciiFormatter.C
--- a/src/fileFormats/nastran/NASCore.C
+++ b/src/fileFormats/nastran/NASCore.C
--- a/src/fileFormats/nastran/NASCore.H
+++ b/src/fileFormats/nastran/NASCore.H
@ -46,7 +46,7 @@ SourceFiles
 namespace Foam
 {

-// Forward declarations
+// Forward Declarations
 class Ostream;

 namespace fileFormats
@ -93,14 +93,6 @@ public:
        //- Extract numbers from things like "-2.358-8" (same as "-2.358e-8")
        static scalar readNasScalar(const std::string& str);

-        //- Deprecated(2017-09)
-        //  Extract numbers from things like "-2.358-8" (same as "-2.358e-8")
-        //  \deprecated(2017-09) - use readNasScalar() method
-        inline static scalar parseNASCoord(const std::string& str)
-        {
-            return readNasScalar(str);
-        }
-
        //- A string::substr() to handle fixed-format and free-format NASTRAN.
        //  Returns the substr to the next comma (if found) or the given length
        //
@ -128,7 +120,6 @@ public:
            const word& keyword,
            const fieldFormat format
        );
-
 };


--- a/src/surfMesh/surfaceFormats/obj/OBJstream.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.C
--- a/src/surfMesh/surfaceFormats/obj/OBJstream.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.H
--- a/src/fileFormats/vtk/base/foamVtkCore.C
+++ b/src/fileFormats/vtk/base/foamVtkCore.C
--- a/src/fileFormats/vtk/base/foamVtkCore.H
+++ b/src/fileFormats/vtk/base/foamVtkCore.H
--- a/src/fileFormats/vtk/base/foamVtkPTraits.C
+++ b/src/fileFormats/vtk/base/foamVtkPTraits.C
--- a/src/fileFormats/vtk/base/foamVtkPTraits.H
+++ b/src/fileFormats/vtk/base/foamVtkPTraits.H
--- a/src/mesh/blockMesh/Make/options
+++ b/src/mesh/blockMesh/Make/options
@ -4,5 +4,6 @@ EXE_INC = \
    -I$(LIB_SRC)/meshTools/lnInclude

 LIB_LIBS = \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@ -13,8 +13,8 @@ $(edgeMeshFormats)/edgeMesh/edgeMeshFormatRunTime.C
 $(edgeMeshFormats)/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormat.C
 $(edgeMeshFormats)/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshFormatRunTime.C

-$(edgeMeshFormats)/nas/NASedgeFormat.C
-$(edgeMeshFormats)/nas/NASedgeFormatRunTime.C
+$(edgeMeshFormats)/nastran/NASedgeFormat.C
+$(edgeMeshFormats)/nastran/NASedgeFormatRunTime.C

 $(edgeMeshFormats)/obj/OBJedgeFormat.C
 $(edgeMeshFormats)/obj/OBJedgeFormatRunTime.C
--- a/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.C
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.C
--- a/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.H
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormat.H
--- a/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormatRunTime.C
+++ b/src/meshTools/edgeMesh/edgeMeshFormats/nastran/NASedgeFormatRunTime.C
--- a/src/overset/Make/options
+++ b/src/overset/Make/options
@ -5,7 +5,6 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -15,6 +14,7 @@ EXE_INC = \

 LIB_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools \
    -lblockMesh \
--- a/src/parallel/distributed/Make/options
+++ b/src/parallel/distributed/Make/options
@ -1,11 +1,13 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude

 LIB_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools \
    -ldecompositionMethods
--- a/src/surfMesh/Make/files
+++ b/src/surfMesh/Make/files
@ -32,7 +32,6 @@ $(surfaceFormats)/gts/GTSsurfaceFormatRunTime.C
 $(surfaceFormats)/gts/triSurfaceGTSformat.C
 $(surfaceFormats)/nas/NASsurfaceFormatRunTime.C
 $(surfaceFormats)/obj/OBJsurfaceFormatRunTime.C
-$(surfaceFormats)/obj/OBJstream.C
 $(surfaceFormats)/off/OFFsurfaceFormatRunTime.C
 $(surfaceFormats)/smesh/SMESHsurfaceFormatRunTime.C
 $(surfaceFormats)/starcd/STARCDsurfaceFormatCore.C
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@ -1,5 +1,6 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
@ -13,6 +14,7 @@ EXE_INC = \

 LIB_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools \
    -lcompressibleTransportModels \
--- a/src/topoChangerFvMesh/Make/options
+++ b/src/topoChangerFvMesh/Make/options
@ -1,5 +1,6 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -7,6 +8,7 @@ EXE_INC = \

 LIB_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
    -lsurfMesh \
    -lmeshTools \
    -ldynamicMesh \