remove obsolete OFversion.H file

if required, OF version is extracted from environment variable WM_PROJECT_VERSION instead
2025-12-08 06:37:44 +00:00 · 2024-01-19 14:11:11 +01:00
parent 0654d060ba
commit 8712e73a68
28 changed files with 0 additions and 33 deletions
--- a/applications/solvers/cfdemSolverIB/Make/options
+++ b/applications/solvers/cfdemSolverIB/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/cfdemSolverIBContinuousForcing/Make/options
+++ b/applications/solvers/cfdemSolverIBContinuousForcing/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/cfdemSolverMultiphase/Make/options
+++ b/applications/solvers/cfdemSolverMultiphase/Make/options
@ -5,7 +5,6 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
     $(PFLAGS) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -ImultiphaseMixture/lnInclude \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
--- a/applications/solvers/cfdemSolverMultiphaseScalar/Make/options
+++ b/applications/solvers/cfdemSolverMultiphaseScalar/Make/options
@ -5,7 +5,6 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
     $(PFLAGS) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -ImultiphaseMixtureScalar/lnInclude \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
--- a/applications/solvers/cfdemSolverPimple/Make/options
+++ b/applications/solvers/cfdemSolverPimple/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/cfdemSolverPiso/Make/options
+++ b/applications/solvers/cfdemSolverPiso/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options
+++ b/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/cfdemSolverPisoMS/Make/options
+++ b/applications/solvers/cfdemSolverPisoMS/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
--- a/applications/solvers/cfdemSolverPisoScalar/Make/options
+++ b/applications/solvers/cfdemSolverPisoScalar/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/cfdemSolverRhoPimple/Make/options
+++ b/applications/solvers/cfdemSolverRhoPimple/Make/options
@ -6,7 +6,6 @@ PFLAGS+= -Dcompre

 EXE_INC = \
     $(PFLAGS) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options
+++ b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options
@ -6,7 +6,6 @@ PFLAGS+= -Dcompre

 EXE_INC = \
     $(PFLAGS) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/cfdTools \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rStatAnalysis/Make/options
+++ b/applications/solvers/rStatAnalysis/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rcfdemSolverBase/Make/options
+++ b/applications/solvers/rcfdemSolverBase/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rcfdemSolverCoupledHeattransfer/Make/options
+++ b/applications/solvers/rcfdemSolverCoupledHeattransfer/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rcfdemSolverForcedTracers/Make/options
+++ b/applications/solvers/rcfdemSolverForcedTracers/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options
+++ b/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options
@ -6,7 +6,6 @@ PFLAGS+= -Dcompre

 EXE_INC = \
     $(PFLAGS) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options
+++ b/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options
@ -6,7 +6,6 @@ PFLAGS+= -Dcompre

 EXE_INC = \
     $(PFLAGS) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rctfSpeciesTransport/Make/options
+++ b/applications/solvers/rctfSpeciesTransport/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/recSolverTurbTransport/Make/options
+++ b/applications/solvers/recSolverTurbTransport/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/rtfmSolverSpecies/Make/options
+++ b/applications/solvers/rtfmSolverSpecies/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/utilities/cfdemPostproc/Make/options
+++ b/applications/utilities/cfdemPostproc/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
    -I$(LIB_SRC)/transportModels \
--- a/applications/utilities/rSmoother/Make/options
+++ b/applications/utilities/rSmoother/Make/options
@ -1,7 +1,6 @@
 include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

 EXE_INC = \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
--- a/etc/OFversion/OFversion.H
+++ b/etc/OFversion/OFversion.H
@ -1,2 +0,0 @@
-#define version4x
-
--- a/etc/bashrc
+++ b/etc/bashrc
@ -106,9 +106,6 @@ export CFDEM_APP_DIR=$CFDEM_PROJECT_DIR/platforms/$WM_OPTIONS/bin
 mkdir -p $CFDEM_LIB_DIR
 mkdir -p $CFDEM_APP_DIR

-#- path to OF version flag file
-export CFDEM_OFVERSION_DIR=$CFDEM_PROJECT_DIR/etc/OFversion
-
 #------------------------------------------------------------------------------
 # Clean standard environment variables (PATH, LD_LIBRARY_PATH)
 #------------------------------------------------------------------------------
--- a/etc/cshrc
+++ b/etc/cshrc
@ -139,9 +139,6 @@ setenv CFDEM_APP_DIR $CFDEM_PROJECT_DIR/platforms/$WM_OPTIONS/bin
 mkdir -p $CFDEM_LIB_DIR
 mkdir -p $CFDEM_APP_DIR

-#- path to OF version flag file
-setenv CFDEM_OFVERSION_DIR $CFDEM_PROJECT_DIR/etc/OFversion
-
 #------------------------------------------------------------------------------
 # Clean standard environment variables (PATH, LD_LIBRARY_PATH)
 #------------------------------------------------------------------------------
--- a/src/lagrangian/cfdemParticle/Make/options
+++ b/src/lagrangian/cfdemParticle/Make/options
@ -11,7 +11,6 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs
 EXE_INC = \
     $(PFLAGS) \
     $(PINC) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/transportModels \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
+++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
@ -43,7 +43,6 @@ SourceFiles
 #define cfdemCloud_H

 // choose version
-#include "OFversion.H"
 #include <vector>
 #include <typeinfo>

--- a/src/lagrangian/cfdemParticleComp/Make/options
+++ b/src/lagrangian/cfdemParticleComp/Make/options
@ -14,7 +14,6 @@ PFLAGS+= -Dcompre
 EXE_INC = \
     $(PFLAGS) \
     $(PINC) \
-    -I$(CFDEM_OFVERSION_DIR) \
    -I../cfdemParticle/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/transportModels \