Added icpc and g++ on mistral.

config/default

@@ -211,8 +211,13 @@ case "${HOSTNAME}" in
 #                 --with-magics=/sw/rhel6-x64/graphics/magicsxx-2.18.15-gfxonly-gcc48 \
 #                 --with-cmor=/sw/rhel6-x64/cmor-2.9.2-shared-gcc48 \
 
-        if  test "$COMP" = icc ; then
-          ${CONFPATH}configure --prefix=$HOME/local \
+        if  test "$COMP" = icpc ; then
+          ${CONFPATH}configure  --enable-cxx \
+                    --with-fftw3 \
+                    $CDOLIBS \
+	            CC=icc CXX=icpc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=native"
+        elif  test "$COMP" = icc ; then
+          ${CONFPATH}configure \
                     --with-fftw3 \
                     $CDOLIBS \
 	            CC=icc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=native"
@@ -220,6 +225,10 @@ case "${HOSTNAME}" in
           ${CONFPATH}configure --disable-openmp \
                     $CDOLIBS \
 	            CC=pgcc CFLAGS="-g -fast"
+        elif  test "$COMP" = g++ ; then
+	  ${CONFPATH}configure --enable-cxx \
+                    $CDOLIBS \
+	            CC=gcc CXX=g++ CFLAGS="-g -Wall -O3 -march=native"
 	else
           ${CONFPATH}configure --prefix=$HOME/local \
                     --with-fftw3 \