[cig-commits] [commit] pluggable: fixed the CASE_3D flag for the OCEANS; also improved the compiler options (a74bccd)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d_globe

On branch  : pluggable
Link       : https://github.com/geodynamics/specfem3d_globe/compare/64e1b38f0c5ebb4056cce0b15d41c0b9f94ab6e5...099a4d330d5b173b21e51ad441f9f429e5d37842

>---------------------------------------------------------------

commit a74bccd4659756d6139cc1890a675cac5a1c07c2
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Thu Aug 14 22:15:36 2008 +0000

    fixed the CASE_3D flag for the OCEANS; also improved the compiler options


>---------------------------------------------------------------

a74bccd4659756d6139cc1890a675cac5a1c07c2
 create_regions_mesh.f90 |  2 +-
 flags.guess             | 26 ++++----------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/create_regions_mesh.f90 b/create_regions_mesh.f90
index aedeb94..b61c50d 100644
--- a/create_regions_mesh.f90
+++ b/create_regions_mesh.f90
@@ -1477,7 +1477,7 @@
         iglobnum=ibool(ix_oceans,iy_oceans,iz_oceans,ispec_oceans)
 
 ! compute local height of oceans
-        if(ISOTROPIC_3D_MANTLE) then
+        if(CASE_3D) then
 
 ! get coordinates of current point
           xval = xstore(ix_oceans,iy_oceans,iz_oceans,ispec_oceans)
diff --git a/flags.guess b/flags.guess
index 393e995..6f36dde 100644
--- a/flags.guess
+++ b/flags.guess
@@ -26,15 +26,13 @@ case $FC in
         # Intel ifort Fortran90 for Linux
         #
         if test x"$FLAGS_CHECK" = x; then
-            FLAGS_CHECK="-O3 -e95 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check all -align sequence -assume byterecl -i-dynamic -ftrapuv -fpe0 -no-ftz -traceback" # -mcmodel=medium
+            FLAGS_CHECK="-O3 -e03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -std03 -check all -align sequence -assume byterecl -ftrapuv -fpe0 -ftz -traceback" # -mcmodel=medium
         fi
         if test x"$FLAGS_NO_CHECK" = x; then
             # standard options
-            FLAGS_NO_CHECK="-O3 -e95 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nobounds -align sequence -assume byterecl -i-dynamic" # -mcmodel=medium
-            # Pangu at Caltech
-            #FLAGS_NO_CHECK = $(IFORT_PROF) -vec_report0 -O2 -static -ip -xP -Wl,--allow-multiple-definition -L $$IFORT_ROOT/lib -limf -lirc
+            FLAGS_NO_CHECK="-O3 -e03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -std03 -check nobounds -align sequence -assume byterecl -fpe3 -ftz" # -mcmodel=medium
             # debug with range checking
-            #FLAGS_NO_CHECK = -O0 -static -e95 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check bounds
+            #FLAGS_NO_CHECK = -O0 -static -e03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -std03 -check bounds
         fi
         #MPI_LIBS = -Vaxlib
         ;;
@@ -90,23 +88,7 @@ case $FC in
                     FLAGS_NO_CHECK="-ansi -u -64 -O3 -OPT:Olimit=0 -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -r10000 -mips4"
                 fi
                 ;;
-            alpha:OSF1)
-                ################## Compaq Dec Alpha #################
-                if test x"$MPIFC" = x; then
-                    MPIFC=$FC
-                    if test x"$MPILIBS" = x; then
-                        MPILIBS="-lfmpi -lmpi"
-                    fi
-                fi
-                if test x"$FLAGS_CHECK" = x; then
-                    FLAGS_CHECK="\$(FLAGS_NO_CHECK) -check bounds"
-                fi
-                if test x"$FLAGS_NO_CHECK" = x; then
-                    FLAGS_NO_CHECK="-fast -warn truncated_source -warn argument_checking -warn unused -warn declarations -std95 -check nounderflow"
-                fi
-                ;;
-            SX-*:SUPER-UX | ES:ESOS)
-                ################## Earth Simulator and NEC SX-5 ##################
+                ################## NEC SX ##################
                 if test x"$MPIFC" = x; then
                     MPIFC=$FC
                 fi