From a67876c202d635079b87544469ab9c09b49ea70a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 21 Jul 2011 09:40:22 +0100
Subject: [PATCH] ENH: foamLog: added -localDB and made -quiet really quiet

---
 bin/foamLog | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 bin/foamLog

diff --git a/bin/foamLog b/bin/foamLog
old mode 100755
new mode 100644
index c86dce622d..fd3e6c7297
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -45,6 +45,7 @@ Usage: $Script [OPTIONS] <log>
   -list             lists but does not extract
   -n                create single column files with the extracted data only
   -quiet            quiet operation
+  -localDB          only use the local database file
   -help             print the usage
 
 $Script - extracts xy files from OpenFOAM logs.
@@ -103,7 +104,7 @@ usage
 
 
 timeName=Time
-unset listOpt quietOpt
+unset listOpt quietOpt localDB
 
 # parse options
 while [ "$#" -gt 0 ]
@@ -125,6 +126,10 @@ do
         quietOpt=true
         shift
         ;;
+    -localDB)
+        localDB=true
+        shift
+        ;;
     -*)
         usage "unknown option: '$*'"
         ;;
@@ -219,7 +224,7 @@ getSolveQueryList()
 getAllQueries()
 {
     #-- All solved for queries from log file
-    queries=`getSolveQueryList $2`
+    [ "$localDB" = true ] || queries=`getSolveQueryList $2`
 
     #-- Add ones from database, present in log file
     # Note: just like awk, line selected with regular expression,
@@ -369,29 +374,30 @@ AWK_CONTENTS
 #
 # Code for extracting solved for quantities
 #
-cat << AWK_CONTENTS >> $AWKFILE
-# Extraction of any solved for variable
-/Solving for/ {
-    extract(\$0, "Solving for ", varNameVal)
+[ "$localDB" = true ] ||
+    cat << AWK_CONTENTS >> $AWKFILE
+    # Extraction of any solved for variable
+    /Solving for/ {
+        extract(\$0, "Solving for ", varNameVal)
 
-    varName=varNameVal[1]
-    file=varName "_" subIter[varName]++
-    file="$outputDir/" file
-    extract(\$0, "Initial residual = ", val)
-    print $timeName "\t" val[1] > file
+        varName=varNameVal[1]
+        file=varName "_" subIter[varName]++
+        file="$outputDir/" file
+        extract(\$0, "Initial residual = ", val)
+        print $timeName "\t" val[1] > file
 
-    varName=varNameVal[1] "FinalRes"
-    file=varName "_" subIter[varName]++
-    file="$outputDir/" file
-    extract(\$0, "Final residual = ", val)
-    print $timeName "\t" val[1] > file
+        varName=varNameVal[1] "FinalRes"
+        file=varName "_" subIter[varName]++
+        file="$outputDir/" file
+        extract(\$0, "Final residual = ", val)
+        print $timeName "\t" val[1] > file
 
-    varName=varNameVal[1] "Iters"
-    file=varName "_" subIter[varName]++
-    file="$outputDir/" file
-    extract(\$0, "No Iterations ", val)
-    print $timeName "\t" val[1] > file
-}
+        varName=varNameVal[1] "Iters"
+        file=varName "_" subIter[varName]++
+        file="$outputDir/" file
+        extract(\$0, "No Iterations ", val)
+        print $timeName "\t" val[1] > file
+    }
 
 AWK_CONTENTS
 # ----------
@@ -432,7 +438,7 @@ done
 # Print found
 #-----------------------------
 myEcho "Generated XY files for:"
-getAllQueries $DBFILE $LOG
+[ "$quietOpt" = true ] || getAllQueries $DBFILE $LOG
 myEcho "End"
 
 #------------------------------------------------------------------------------