From 82b3c0c1d5d3e6150d48bf5b49efe198010559e3 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Tue, 24 Jul 2018 16:11:12 +0100
Subject: [PATCH 1/2] cubicEqn, quadraticEqn: Correction to repeated roots

This resolves bug report https://bugs.openfoam.org/view.php?id=3015
---
 src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqn.C      | 2 +-
 .../primitives/polynomialEqns/quadraticEqn/quadraticEqn.C       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqn.C b/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqn.C
index 9633937f6..5e3b8899f 100644
--- a/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqn.C
+++ b/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqn.C
@@ -96,7 +96,7 @@ Foam::Roots<3> Foam::cubicEqn::roots() const
 
     if (oneReal)
     {
-        const Roots<1> r = linearEqn(- a, b/3).roots();
+        const Roots<1> r = linearEqn(a, b/3).roots();
         return Roots<3>(r.type(0), r[0]);
     }
     else if (twoReal)
diff --git a/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqn.C b/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqn.C
index 0fea8e6e9..cfcfceafa 100644
--- a/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqn.C
+++ b/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqn.C
@@ -71,7 +71,7 @@ Foam::Roots<2> Foam::quadraticEqn::roots() const
 
     if (oneReal)
     {
-        const Roots<1> r = linearEqn(- a, b/2).roots();
+        const Roots<1> r = linearEqn(a, b/2).roots();
         return Roots<2>(r, r);
     }
     else if (twoReal)

From 50bf76a4222529ca68b8bed9332cbbbf3e85304f Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Wed, 25 Jul 2018 08:57:10 +0100
Subject: [PATCH 2/2] foamGet: check target directory exists and warn

only if controlDict does not exist.
---
 bin/foamGet | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/foamGet b/bin/foamGet
index 6fecbce0b..b783ad998 100755
--- a/bin/foamGet
+++ b/bin/foamGet
@@ -54,7 +54,7 @@ USAGE
 
 error() {
     exec 1>&2
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    while [ "$#" -ge 1 ]; do echo "Error: $1"; shift; done
     usage
     exit 1
 }
@@ -136,7 +136,7 @@ setFile () {
 noFilesMessage () {
     _ext="$1"
     [ "$_ext" = "ANY" ] && echo "(with or without file extensions)" && return 1
-    [ -n "$_ext" ] && echo "with file extension $_ext" && return 1
+    [ -n "$_ext" ] && echo "with file extension '$_ext'" && return 1
 }
 
 searchDirs="\
@@ -170,7 +170,6 @@ do
    -t | -target)
       [ "$#" -ge 2 ] || error "'$1' option requires an argument"
       tgt="$2"
-      [ -d "$tgt" ] || error "directory with -t option does not exist: '$tgt'"
       shift 2
       ;;
    -*)
@@ -183,15 +182,16 @@ do
 done
 
 [ $# -gt 1 ] && error "$# arguments \"$*\" specified: only 1 permitted"
-[ $# -eq 1 ] || error "Missing argument: no file name/prefix <file> supplied"
+[ $# -eq 1 ] || error "missing argument: no file name/prefix <file> supplied"
 prefix="$1"
 
 [ -s "system/controlDict" ] || \
-    error "Cannot find OpenFOAM case directory (no system/controlDict file)"
+    echo "Warning: cannot find OpenFOAM case directory (no system/controlDict file)"
+[ -d "$tgt" ] || error "target directory does not exist: '$tgt'"
 
 files="$(findFiles "$searchDirs" "$prefix" "$ext")"
 [ -z "$files" ] && \
-    error "No file $prefix found $(noFilesMessage "$ext")"
+    error "no file $prefix found $(noFilesMessage "$ext")"
 
 nFiles="$(nArgs "$files")"
 [ "$nFiles" -eq 1 ] && cpFile "$files" "$tgt" && exit 0