Commit 4307e171 authored by Mark Olesen's avatar Mark Olesen
Browse files

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
parent fbb371dd
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
......@@ -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;
......
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lfileFormats \
-lsurfMesh \
-lmeshTools
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 \
......
......@@ -25,6 +25,8 @@ EXE_INC = \
LIB_LIBS = \
${CGAL_LIBS} \
-lfileFormats \
-lsurfMesh \
-lmeshTools \
-ldecompose \
-ldynamicMesh \
......
......@@ -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)
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lfileFormats \
-lsurfMesh \
-lmeshTools
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lfileFormats \
-lsurfMesh \
-lmeshTools
......@@ -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
......
......@@ -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
);
};
......
......@@ -4,5 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-lfileFormats \
-lsurfMesh \
-lmeshTools
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment