View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0004121 | OpenFOAM | Patch | public | 2024-07-30 11:11 | 2024-07-31 16:20 |
| Reporter | wyldckat | Assigned To | henry | ||
| Priority | low | Severity | trivial | Reproducibility | always |
| Status | resolved | Resolution | fixed | ||
| Platform | GNU/Linux | OS | Other | OS Version | (please specify) |
| Product Version | dev | ||||
| Fixed in Version | dev | ||||
| Summary | 0004121: Duplicate lines found in a few 'Make/options' | ||||
| Description | The following files have duplicate lines: applications/legacy/combustion/PDRFoam/Make/options applications/modules/isothermalFilm/fvModels/filmVoFTransfer/Make/options src/functionObjects/field/Make/options Provided the changes in the attached files: - duplicates_in_options_v1.patch - for easier inspection of the changes - duplicates_in_options_v1.tar.gz - provides the modified files | ||||
| Steps To Reproduce | The attached script 'checkOptionsForDuplicateFiles' assisted in finding the files and which were the duplicate lines. This is an upgraded version from issue #2169. | ||||
| Tags | No tags attached. | ||||
|
|
checkOptionsForDuplicateFiles (574 bytes)
#!/bin/sh
echo "Processing folders: $FOAM_SRC $FOAM_APP"
echo ""
find $FOAM_SRC $FOAM_APP -name options -type f | while read item
do
if [ $(grep -v '^$' $item | wc -l) -ne $(grep -v '^$' $item | sort -u | wc -l) ]
then
grep -v '^$' $item | sort > ${item}.sorted
grep -v '^$' $item | sort -u > ${item}.unique
echo "File with duplicate lines: $item - duplicate lines:"
diff --horizon-lines=0 ${item}.sorted ${item}.unique | grep "<"
rm ${item}.sorted ${item}.unique
echo ""
fi
done
echo "Processing complete."
duplicates_in_options_v1.patch (2,453 bytes)
diff --git a/applications/legacy/combustion/PDRFoam/Make/options b/applications/legacy/combustion/PDRFoam/Make/options
index 60f6413bf5..e7a5b77cd3 100644
--- a/applications/legacy/combustion/PDRFoam/Make/options
+++ b/applications/legacy/combustion/PDRFoam/Make/options
@@ -9,10 +9,8 @@ EXE_INC = \
-IXiModels/XiEqModels/instabilityXiEq \
-IXiModels/XiEqModels/SCOPEBlendXiEq \
-IXiModels/XiEqModels/SCOPEXiEq \
- -IXiModels/XiEqModels/XiEqModel \
-IXiModels/XiGModels/instabilityG \
-IXiModels/XiGModels/KTS \
- -IXiModels/XiGModels/XiGModel \
-IPDRModels/dragModels/basic \
-IPDRModels/dragModels/PDRDragModel \
-IPDRModels/XiEqModels/basicXiSubXiEq \
diff --git a/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/Make/options b/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/Make/options
index 175590c59a..7ee3f3d787 100644
--- a/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/Make/options
+++ b/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/Make/options
@@ -14,11 +14,8 @@ EXE_INC = \
-I$(FOAM_MODULES)/fluidSolver/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/VoF \
-I$(LIB_SRC)/twoPhaseModels/interfaceCompression/lnInclude \
- -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \
- -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
- -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \
\
diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options
index 9a114f11f6..0cc65927c7 100644
--- a/src/functionObjects/field/Make/options
+++ b/src/functionObjects/field/Make/options
@@ -10,7 +10,6 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
- -I$(LIB_SRC)/physicalProperties/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
|
|
|
Thanks. Resolved by https://github.com/OpenFOAM/OpenFOAM-dev/commit/b460ed9f74e9525e7301069abde00c2840558069 |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2024-07-30 11:11 | wyldckat | New Issue | |
| 2024-07-30 11:11 | wyldckat | Status | new => assigned |
| 2024-07-30 11:11 | wyldckat | Assigned To | => henry |
| 2024-07-30 11:11 | wyldckat | File Added: duplicates_in_options_v1.tar.gz | |
| 2024-07-30 11:11 | wyldckat | File Added: checkOptionsForDuplicateFiles | |
| 2024-07-30 11:11 | wyldckat | File Added: duplicates_in_options_v1.patch | |
| 2024-07-30 11:12 | wyldckat | Relationship added | related to 0002169 |
| 2024-07-31 16:20 | will | Status | assigned => resolved |
| 2024-07-31 16:20 | will | Resolution | open => fixed |
| 2024-07-31 16:20 | will | Fixed in Version | => dev |
| 2024-07-31 16:20 | will | Note Added: 0013333 |
