updated advanced_lab

advanced_lab/c/Makefile

-CC = cc
-ifeq ($(CRAY_PRGENVCRAY), loaded)
-CFLAGS = -O2 -openmp
-else ifeq ($(CRAY_PRGENVINTEL), loaded)
-CFLAGS = -O2 -openmp -D_Float128=__float128
-else ifeq ($(CRAY_PRGENVGNU), loaded)
+# for GNU compiler
+CC = gcc
 CFLAGS = -O2 -fopenmp
-else
-CFLAGS = -O2
-endif
+
+# for Intel compiler
+#CC = icc
+#CFLAGS = -O2 -qopenmp
+
 SRC = vtk_export.c shwater2d.c
 OBJS = ${SRC:.c=.o}
 DEST = shwater2d

advanced_lab/f90/Makefile

-FC = ftn
-ifeq ($(CRAY_PRGENVCRAY), loaded)
-FFLAGS = -O2 -openmp
-else ifeq ($(CRAY_PRGENVINTEL), loaded)
-FFLAGS = -O2 -openmp
-else ifeq ($(CRAY_PRGENVGNU), loaded)
-ifeq ($(shell expr $(GCC_VERSION) '<' 5.0), 1)
-$(error Unsupported GCC version, use at least v5.x (module swap gcc gcc/5.1.0))
-endif
+# for GNU compiler
+FC = gfortran
 FFLAGS = -O2 -fopenmp
-else
-FFLAGS = -O2
-endif
+
+# for Intel compiler
+#FC = ifort
+#FFLAGS = -O2 -fopenmp
+
 SRC = vtk_export.f90 shwater2d.f90
 OBJS = ${SRC:.f90=.o}
 DEST = shwater2d