From 8712e73a68529129c0e11688c0208515c2fe798c Mon Sep 17 00:00:00 2001 From: danielque Date: Fri, 19 Jan 2024 14:11:11 +0100 Subject: [PATCH] remove obsolete OFversion.H file if required, OF version is extracted from environment variable WM_PROJECT_VERSION instead --- applications/solvers/cfdemSolverIB/Make/options | 1 - .../solvers/cfdemSolverIBContinuousForcing/Make/options | 1 - applications/solvers/cfdemSolverMultiphase/Make/options | 1 - applications/solvers/cfdemSolverMultiphaseScalar/Make/options | 1 - applications/solvers/cfdemSolverPimple/Make/options | 1 - applications/solvers/cfdemSolverPiso/Make/options | 1 - applications/solvers/cfdemSolverPisoFreeStreaming/Make/options | 1 - applications/solvers/cfdemSolverPisoMS/Make/options | 1 - applications/solvers/cfdemSolverPisoScalar/Make/options | 1 - applications/solvers/cfdemSolverRhoPimple/Make/options | 1 - applications/solvers/cfdemSolverRhoPimpleChem/Make/options | 1 - applications/solvers/rStatAnalysis/Make/options | 1 - applications/solvers/rcfdemSolverBase/Make/options | 1 - .../solvers/rcfdemSolverCoupledHeattransfer/Make/options | 1 - applications/solvers/rcfdemSolverForcedTracers/Make/options | 1 - applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options | 1 - .../solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options | 1 - applications/solvers/rctfSpeciesTransport/Make/options | 1 - applications/solvers/recSolverTurbTransport/Make/options | 1 - applications/solvers/rtfmSolverSpecies/Make/options | 1 - applications/utilities/cfdemPostproc/Make/options | 1 - applications/utilities/rSmoother/Make/options | 1 - etc/OFversion/OFversion.H | 2 -- etc/bashrc | 3 --- etc/cshrc | 3 --- src/lagrangian/cfdemParticle/Make/options | 1 - src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H | 1 - src/lagrangian/cfdemParticleComp/Make/options | 1 - 28 files changed, 33 deletions(-) delete mode 100644 etc/OFversion/OFversion.H diff --git a/applications/solvers/cfdemSolverIB/Make/options b/applications/solvers/cfdemSolverIB/Make/options index 90f9e40c..009aac2a 100755 --- 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 \ diff --git a/applications/solvers/cfdemSolverIBContinuousForcing/Make/options b/applications/solvers/cfdemSolverIBContinuousForcing/Make/options index 90f9e40c..009aac2a 100755 --- 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 \ diff --git a/applications/solvers/cfdemSolverMultiphase/Make/options b/applications/solvers/cfdemSolverMultiphase/Make/options index 926b021a..477d2394 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/Make/options b/applications/solvers/cfdemSolverMultiphaseScalar/Make/options index ce909f3b..64344370 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverPimple/Make/options b/applications/solvers/cfdemSolverPimple/Make/options index a6db87b6..4f365da4 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverPiso/Make/options b/applications/solvers/cfdemSolverPiso/Make/options index a6db87b6..4f365da4 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options b/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options index 3b6c16f4..a7078841 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverPisoMS/Make/options b/applications/solvers/cfdemSolverPisoMS/Make/options index 096bea87..8648cee1 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverPisoScalar/Make/options b/applications/solvers/cfdemSolverPisoScalar/Make/options index 10c23bb2..d4435204 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverRhoPimple/Make/options b/applications/solvers/cfdemSolverRhoPimple/Make/options index ffb7fbb9..c977bd8b 100644 --- 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 \ diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options index 79bf26bb..0f4fb565 100644 --- 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 \ diff --git a/applications/solvers/rStatAnalysis/Make/options b/applications/solvers/rStatAnalysis/Make/options index fac0625a..3108dfc1 100644 --- 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 \ diff --git a/applications/solvers/rcfdemSolverBase/Make/options b/applications/solvers/rcfdemSolverBase/Make/options index 61528061..101a2bd5 100644 --- 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 \ diff --git a/applications/solvers/rcfdemSolverCoupledHeattransfer/Make/options b/applications/solvers/rcfdemSolverCoupledHeattransfer/Make/options index 61528061..101a2bd5 100644 --- 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 \ diff --git a/applications/solvers/rcfdemSolverForcedTracers/Make/options b/applications/solvers/rcfdemSolverForcedTracers/Make/options index bb12e544..581ff4fd 100644 --- 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 \ diff --git a/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options b/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options index d1cae6bf..92cf653c 100644 --- 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 \ diff --git a/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options b/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options index bfb52167..8eb2480e 100644 --- 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 \ diff --git a/applications/solvers/rctfSpeciesTransport/Make/options b/applications/solvers/rctfSpeciesTransport/Make/options index bb12e544..581ff4fd 100755 --- 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 \ diff --git a/applications/solvers/recSolverTurbTransport/Make/options b/applications/solvers/recSolverTurbTransport/Make/options index 686f676c..e5c1989d 100755 --- 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 \ diff --git a/applications/solvers/rtfmSolverSpecies/Make/options b/applications/solvers/rtfmSolverSpecies/Make/options index 61528061..101a2bd5 100644 --- 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 \ diff --git a/applications/utilities/cfdemPostproc/Make/options b/applications/utilities/cfdemPostproc/Make/options index 04215a2d..8d1ce02b 100644 --- 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 \ diff --git a/applications/utilities/rSmoother/Make/options b/applications/utilities/rSmoother/Make/options index f7b9168c..f4222513 100644 --- 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 \ diff --git a/etc/OFversion/OFversion.H b/etc/OFversion/OFversion.H deleted file mode 100644 index 30b371b3..00000000 --- a/etc/OFversion/OFversion.H +++ /dev/null @@ -1,2 +0,0 @@ -#define version4x - diff --git a/etc/bashrc b/etc/bashrc index a3a063dc..13e88efe 100755 --- 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) #------------------------------------------------------------------------------ diff --git a/etc/cshrc b/etc/cshrc index 2a8122ab..2ddaec58 100755 --- 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) #------------------------------------------------------------------------------ diff --git a/src/lagrangian/cfdemParticle/Make/options b/src/lagrangian/cfdemParticle/Make/options index e7237168..366c02b6 100644 --- 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 \ diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index a938c965..341de666 100644 --- 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 #include diff --git a/src/lagrangian/cfdemParticleComp/Make/options b/src/lagrangian/cfdemParticleComp/Make/options index c701bda9..9f6e72f2 100644 --- 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 \