[cig-commits] r15706 - seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN

[pieyre at geodynamics.org]

Author: pieyre
Date: 2009-09-30 07:03:33 -0700 (Wed, 30 Sep 2009)
New Revision: 15706

Modified:
   seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/combine_vol_data.f90
   seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/flags.guess
   seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/write_c_binary.c
Log:
Fixed small errors in combine_vol_data.f90, included stdlib.h in write_c_binary.c and added Fortran 2003 standard in flags.guess

Modified: seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/combine_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/combine_vol_data.f90	2009-09-29 23:34:35 UTC (rev 15705)
+++ seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/combine_vol_data.f90	2009-09-30 14:03:33 UTC (rev 15706)
@@ -39,15 +39,15 @@
   integer i,j,k,ispec, ios, it
   integer iproc, proc1, proc2, num_node, node_list(300), nspec, nglob
   integer np, ne, npp, nee, npoint, nelement, njunk, njunk2, n1, n2, n3, n4, n5, n6, n7, n8
-  integer ibool(NGLLX,NGLLY,NGLLZ,NSPEC_AB)
+  integer ibool(NGLLX,NGLLY,NGLLZ,NSPEC_AB_VAL)
   integer numpoin, iglob1, iglob2, iglob3, iglob4, iglob5, iglob6, iglob7, iglob8, iglob
-  logical mask_ibool(NGLOB_AB)
-  real(kind=CUSTOM_REAL) data(NGLLX,NGLLY,NGLLZ,NSPEC_AB)
-  real(kind=CUSTOM_REAL),dimension(NGLOB_AB) :: xstore, ystore, zstore
-  real x, y, z, dat(NGLLX,NGLLY,NGLLZ,NSPEC_AB)
-  character(len=150) :: sline, arg(5), filename, indir, outdir, prname
+  logical mask_ibool(NGLOB_AB_VAL)
+  real(kind=CUSTOM_REAL) data(NGLLX,NGLLY,NGLLZ,NSPEC_AB_VAL)
+  real(kind=CUSTOM_REAL),dimension(NGLOB_AB_VAL) :: xstore, ystore, zstore
+  real x, y, z, dat(NGLLX,NGLLY,NGLLZ,NSPEC_AB_VAL)
+  character(len=150) :: sline, arg(6), filename, indir, outdir, prname
   character(len=150) :: mesh_file, local_point_file, local_element_file, local_file, local_data_file, local_ibool_file
-  integer :: num_ibool(NGLOB_AB)
+  integer :: num_ibool(NGLOB_AB_VAL)
   logical :: HIGH_RESOLUTION_MESH
   integer :: ires
 
@@ -56,7 +56,7 @@
   print *
 
   do i = 1, 6
-    call getarg(i,arg(i))
+    call get_command_argument(i,arg(i))
     if (i < 6 .and. trim(arg(i)) == '') then
       print *, 'Usage: xcombine_data start_slice end_slice filename input_dir output_dir high/low-resolution'
       print *, '    or xcombine_data slice_list filename input_dir output_dir high/low-resolution'
@@ -117,8 +117,8 @@
   mesh_file = trim(outdir) // '/' // trim(filename)//'.mesh'
   call open_file(trim(mesh_file)//char(0))
 
-  nspec = NSPEC_AB
-  nglob = NGLOB_AB
+  nspec = NSPEC_AB_VAL
+  nglob = NGLOB_AB_VAL
 
   np = 0
 

Modified: seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/flags.guess
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/flags.guess	2009-09-29 23:34:35 UTC (rev 15705)
+++ seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/flags.guess	2009-09-30 14:03:33 UTC (rev 15706)
@@ -26,13 +26,13 @@
         # Intel ifort Fortran90 for Linux
         #
         if test x"$FLAGS_CHECK" = x; then
-            FLAGS_CHECK="-O3 -vec-report0 -e95 -std95 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage -check nobounds -align sequence -assume byterecl -fpe0 -ftz -traceback -ftrapuv" # -mcmodel=medium
+            FLAGS_CHECK="-O3 -vec-report0 -e95 -std03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage -check nobounds -align sequence -assume byterecl -fpe0 -ftz -traceback -ftrapuv" # -mcmodel=medium
         fi
         if test x"$FLAGS_NO_CHECK" = x; then
 # standard options (leave option -ftz, which is *critical* for performance)
 # add -Winline to get information about routines that are inlined
 # add -vec-report3 to get information about loops that are vectorized or not
-            FLAGS_NO_CHECK="-O3 -xP -vec-report0 -e95 -std95 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage -check nobounds -align sequence -assume byterecl -fpe3 -ftz" # -mcmodel=medium
+            FLAGS_NO_CHECK="-O3 -xP -vec-report0 -e95 -std03 -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage -check nobounds -align sequence -assume byterecl -fpe3 -ftz" # -mcmodel=medium
         fi
         #MPI_LIBS = -Vaxlib
         ;;
@@ -41,7 +41,7 @@
         # GNU gfortran
         #
         if test x"$FLAGS_NO_CHECK" = x; then
-            FLAGS_NO_CHECK="-std=f95 -fimplicit-none -frange-check -O3 -fmax-errors=10 -pedantic -pedantic-errors -Waliasing -Wampersand -Wcharacter-truncation -Wline-truncation -Wsurprising -Wno-tabs -Wunderflow -fno-trapping-math" # -mcmodel=medium
+            FLAGS_NO_CHECK="-std=f2003 -fimplicit-none -frange-check -O3 -fmax-errors=10 -pedantic -pedantic-errors -Waliasing -Wampersand -Wcharacter-truncation -Wline-truncation -Wsurprising -Wno-tabs -Wunderflow -fno-trapping-math" # -mcmodel=medium
 # older gfortran syntax
 #           FLAGS_NO_CHECK="-std=f95 -fimplicit-none -frange-check -O3 -Wunused-labels -Waliasing -Wampersand -Wsurprising -Wline-truncation -Wunderflow -fno-trapping-math" # -mcmodel=medium
         fi

Modified: seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/write_c_binary.c
===================================================================
--- seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/write_c_binary.c	2009-09-29 23:34:35 UTC (rev 15705)
+++ seismo/3D/SPECFEM3D_SESAME/tags/v1.4.3_last_BASIN/write_c_binary.c	2009-09-30 14:03:33 UTC (rev 15706)
@@ -29,6 +29,7 @@
 
 #include "config.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>