Skip to content
Snippets Groups Projects
Commit 7446cee7 authored by Mark Olesen's avatar Mark Olesen
Browse files

DebugSwitches in etc/controlDict is incomplete/incorrect

 Added doc/Doxygen/tools/find-debugNames to help but the problem requires
 more attention (Henry/Andy/Mattijs?)
 Caveat:
   - names defined with nested defines will be missed.
   - names defined via typename will be missed.

Cleanup example:

#!/bin/sh
(
cd $WM_PROJECT_DIR
doc/Doxygen/tools/find-debugNames|tee debugs.orig|sed -e 's@ *//.*$@@'>debugs
diff -uw etc/controlDict debugs > debugs.diff
echo "hand-resolve the conflicts - see debugs.diff"
)
parent e629d33a
No related branches found
No related tags found
No related merge requests found
...@@ -12,4 +12,5 @@ Misc Tools ...@@ -12,4 +12,5 @@ Misc Tools
2. find-its 2. find-its
3. find-junkFiles 3. find-junkFiles
4. find-longlines 4. find-longlines
5. find-debugNames (requires git)
#!/usr/bin/perl -w
use strict;
# -----------------------------------------------------------------------------
#
# Script
# find-debugNames
#
# Description
# Use git-grep to find these macros.
#
# defineTypeNameAndDebug
# defineTemplateTypeNameAndDebugWithName
# defineTemplateTypeNameAndDebug
# defineNamedTemplateTypeNameAndDebug
#
# print sorted list
#
# Note
# will miss debug switches that are defined usign two defines
# -----------------------------------------------------------------------------
$ENV{WM_PROJECT_DIR} and chdir "$ENV{WM_PROJECT_DIR}"
or die "cannot change to OpenFOAM dir\n";
local @ARGV =
q{git-grep -e 'define\(Named\)*\(Template\)*TypeNameAndDebug\(WithName\)*' src applications |};
# parse stuff that looks like this:
# ODE/ODESolvers/KRR4/KRR4.C:defineTypeNameAndDebug(Foam::KRR4, 0);
my %debug;
while (<>) {
/#/ and next; # avoid defines
if (s{,\s*(\d+)\s*\)\s*\;\s*$}{}) # get value and chop end
{
my $v = $1;
s{\s*,.*$}{}; # remove all trailing info
s{^(.+?):(.+?)\(\s*(Foam::)?}{} or next; # get file and chop begin
my $file = $1;
my $k = $_;
$debug{$k} = [ $v, $file ];
}
}
print "DebugSwitches\n{\n";
for my $k ( sort keys %debug ) {
my ( $v, $file ) = @{ $debug{$k} };
my $pad = ( 20 - length $k );
while ( $pad <= 1 ) {
$pad += 4;
}
$pad = ' ' x $pad;
print " $k$pad$v; // $file\n";
}
print "}\n";
...@@ -57,8 +57,8 @@ DebugSwitches ...@@ -57,8 +57,8 @@ DebugSwitches
C8H18 0; C8H18 0;
C9H20 0; C9H20 0;
CH3OH 0; CH3OH 0;
CallbackRegistry 0; CallbackRegistryName 0;
CarnahanStarling 0; CarnahanStarlingRadial 0;
ChomiakInjector 0; ChomiakInjector 0;
Cloud<indexedParticle> 0; Cloud<indexedParticle> 0;
Cloud<kinematicParcel> 0; Cloud<kinematicParcel> 0;
...@@ -208,7 +208,7 @@ DebugSwitches ...@@ -208,7 +208,7 @@ DebugSwitches
SIBS 0; SIBS 0;
SKA 0; SKA 0;
SLTS 0; SLTS 0;
STARCDRotation 0; STARCDCoordinateRotation 0;
Schaeffer 0; Schaeffer 0;
SchillerNaumann 0; SchillerNaumann 0;
SinclairJackson 0; SinclairJackson 0;
...@@ -781,6 +781,7 @@ DebugSwitches ...@@ -781,6 +781,7 @@ DebugSwitches
volVectorField 0; volVectorField 0;
volVectorField::DimensionedInternalField 0; volVectorField::DimensionedInternalField 0;
vtk 0; vtk 0;
vtkPV3Foam 0;
walkPatch 0; walkPatch 0;
wall 0; wall 0;
wallHeatTransfer 0; wallHeatTransfer 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment