From 566ae0f57f5495bd1c641a6426da757ed7db7aa1 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 4 Oct 2010 16:48:17 +0100
Subject: [PATCH] Reverting garbage

---
 etc/cshrc | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/etc/cshrc b/etc/cshrc
index dae2a0e3f..a9385547b 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright held by original author
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -32,9 +32,12 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-setenv WM_PROJECT_VERSION 1.6.x
+setenv WM_PROJECT_VERSION 1.6-ext
 
-################################################################################
+# helps to easily write #ifdefs to detect a dev-version
+setenv FOAM_DEV 1
+
+###############################################################################
 # USER EDITABLE PART
 #
 #    either setenv FOAM_INST_DIR before sourcing this file or set
@@ -48,7 +51,7 @@ set foamInstall = $HOME/$WM_PROJECT
 # set foamInstall = /opt/$WM_PROJECT
 #
 # END OF (NORMAL) USER EDITABLE PART
-################################################################################
+###############################################################################
 
 # note the location for later use (eg, in job scripts)
 if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
@@ -78,7 +81,9 @@ if ( ! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX
 
 # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc
+#if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc
+#setenv WM_COMPILER Gcc
+setenv WM_COMPILER Icc
 
 setenv WM_COMPILER_ARCH
 setenv WM_COMPILER_LIB_ARCH
@@ -86,6 +91,8 @@ setenv WM_COMPILER_LIB_ARCH
 
 # Compilation options (architecture, precision, optimised, debug or profiling)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv WM_NCOMPPROCS 2
+
 # WM_ARCH_OPTION = 32 | 64
 if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64
 
@@ -93,13 +100,13 @@ if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64
 if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
 
 # WM_COMPILE_OPTION = Opt | Debug | Prof
-if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
+#if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
+setenv WM_COMPILE_OPTION Opt
+#setenv WM_COMPILE_OPTION Debug
 
 # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
 
-setenv WM_NCOMPPROCS 2
-
 
 # Run options (floating-point signal handling and memory initialisation)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -124,8 +131,6 @@ case Linux:
         case 32:
             setenv WM_ARCH linux
             setenv WM_COMPILER_ARCH '-64'
-            setenv WM_CC 'gcc'
-            setenv WM_CXX 'g++'
             setenv WM_CFLAGS '-m32 -fPIC'
             setenv WM_CXXFLAGS '-m32 -fPIC'
             setenv WM_LDFLAGS '-m32'
@@ -134,8 +139,6 @@ case Linux:
         case 64:
             setenv WM_ARCH linux64
             setenv WM_COMPILER_LIB_ARCH 64
-            setenv WM_CC 'gcc'
-            setenv WM_CXX 'g++'
             setenv WM_CFLAGS '-m64 -fPIC'
             setenv WM_CXXFLAGS '-m64 -fPIC'
             setenv WM_LDFLAGS '-m64'
@@ -156,19 +159,19 @@ case Linux:
     case mips64:
         setenv WM_ARCH SiCortex64
         setenv WM_COMPILER_LIB_ARCH 64
-        setenv WM_CC 'gcc'
-        setenv WM_CXX 'g++'
         setenv WM_CFLAGS '-mabi=64 -fPIC'
         setenv WM_CXXFLAGS '-mabi=64 -fPIC'
         setenv WM_LDFLAGS '-mabi=64 -G0'
         setenv WM_MPLIB MPI
+        ;;
+    case Darwin:
+        setenv WM_ARCH darwin
+        setenv WM_COMPILER
         breaksw
 
     case ppc64:
         setenv WM_ARCH linuxPPC64
         setenv WM_COMPILER_LIB_ARCH 64
-        setenv WM_CC 'gcc'
-        setenv WM_CXX 'g++'
         setenv WM_CFLAGS '-m64 -fPIC'
         setenv WM_CXXFLAGS '-m64 -fPIC'
         setenv WM_LDFLAGS '-m64'
@@ -184,8 +187,6 @@ case Linux:
 case SunOS:
     setenv WM_ARCH SunOS64
     setenv WM_COMPILER_LIB_ARCH 64
-    setenv WM_CC 'gcc'
-    setenv WM_CXX 'g++'
     setenv WM_CFLAGS '-mabi=64 -fPIC'
     setenv WM_CXXFLAGS '-mabi=64 -fPIC'
     setenv WM_LDFLAGS '-mabi=64 -G0'
@@ -267,3 +268,4 @@ unset cleanEnv cleanProg colonPath foamInstall foamOldDirs
 unalias _foamSource
 
 # -----------------------------------------------------------------------------
+