From 5d1a756178630ef9c67648e20bbe218605cac53a Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Wed, 8 Sep 2021 09:04:40 +0100
Subject: [PATCH] etc/config.sh/unset: Added missing environment variables

---
 etc/config.csh/unset | 4 +++-
 etc/config.sh/unset  | 4 +++-
 etc/cshrc            | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 6e4a95e92b..d3de9c6fdf 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -122,8 +122,10 @@ unsetenv ENSIGHT9_READER
 unsetenv CMAKE_HOME
 unsetenv ParaView_DIR
 unsetenv ParaView_INCLUDE_DIR
+unsetenv ParaView_LIB_DIR
 unsetenv ParaView_MAJOR
 unsetenv ParaView_VERSION
+unsetenv ParaView_GL
 unsetenv PV_PLUGIN_PATH
 
 
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index d9c368034b..f3d72d1a41 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -118,8 +118,10 @@ unset ENSIGHT9_READER
 unset CMAKE_HOME
 unset ParaView_DIR
 unset ParaView_INCLUDE_DIR
+unset ParaView_LIB_DIR
 unset ParaView_MAJOR
 unset ParaView_VERSION
+unset ParaView_GL
 unset PV_PLUGIN_PATH
 
 
diff --git a/etc/cshrc b/etc/cshrc
index d86cdb02ee..d2c5194f8d 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -62,8 +62,7 @@ setenv WM_COMPILER_TYPE system
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc48 ... Gcc62 | Clang | Icx
 setenv WM_COMPILER Gcc
-setenv WM_COMPILER_ARCH # defined but empty
-unsetenv WM_COMPILER_LIB_ARCH
+unsetenv WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 
 #- Memory addressing:
 #    On a 64bit OS this can be 32bit or 64bit