[cig-commits] r19256 - in seismo/2D/SPECFEM2D/trunk: . src/meshfem2D/scotch_5.1.11/src src/specfem2D

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2011-11-30 16:24:33 -0800 (Wed, 30 Nov 2011)
New Revision: 19256

Modified:
   seismo/2D/SPECFEM2D/trunk/flags.guess
   seismo/2D/SPECFEM2D/trunk/src/meshfem2D/scotch_5.1.11/src/Makefile.inc.in
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/plotpost.F90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
Log:
fixed the line length problem detected by Paul Cristini


Modified: seismo/2D/SPECFEM2D/trunk/flags.guess
===================================================================
--- seismo/2D/SPECFEM2D/trunk/flags.guess	2011-11-30 17:16:03 UTC (rev 19255)
+++ seismo/2D/SPECFEM2D/trunk/flags.guess	2011-12-01 00:24:33 UTC (rev 19256)
@@ -41,7 +41,8 @@
             # ifort version 11 or 10.1 with these flags shows good performance
             #FLAGS_CHECK="-O3 -ftz -xS -fpe0 -traceback -ftrapuv -vec-report0 -std95 -implicitnone -check nobounds -assume byterecl -static-intel -warn truncated_source -warn argument_checking -warn unused -warn declarations -warn alignments -warn ignore_loc -warn usage "
             #FLAGS_CHECK="-O3 -xS -static-intel -r8 -mcmodel=large -implicitnone -warn truncated_source -warn argument_checking -warn unused -warn declarations -check nobounds -align sequence -assume byterecl -ftrapuv -fpe0 -ftz -traceback"
-            # for debugging: change -check nobounds to -check all
+        # useful for debugging...
+            # for debugging: change -check nobounds to -check all -debug -g -O0 -fp-stack-check -traceback -ftrapuv
         fi
         ;;
     gfortran|*/gfortran|f95|*/f95)

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/scotch_5.1.11/src/Makefile.inc.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/scotch_5.1.11/src/Makefile.inc.in	2011-11-30 17:16:03 UTC (rev 19255)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/scotch_5.1.11/src/Makefile.inc.in	2011-12-01 00:24:33 UTC (rev 19256)
@@ -11,7 +11,7 @@
 CCD		= @CC@
 CFLAGS		= -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD -Drestrict=__restrict
 CLIBFLAGS	=
-LDFLAGS		= -lz -lm -lrt
+LDFLAGS		= -lz -lm -lrt -lpthread
 CP		= cp
 LEX		= @LEX@ -Pscotchyy -olex.yy.c
 LN		= ln

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/plotpost.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/plotpost.F90	2011-11-30 17:16:03 UTC (rev 19255)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/plotpost.F90	2011-12-01 00:24:33 UTC (rev 19256)
@@ -1779,7 +1779,8 @@
         call MPI_RECV (coorg_recv_ps_velocity_model(1,1), &
              2*nspec_recv*((NGLLX-subsamp_postscript)/subsamp_postscript)*((NGLLX-subsamp_postscript)/subsamp_postscript)*4, &
              MPI_DOUBLE_PRECISION, iproc, 42, MPI_COMM_WORLD, request_mpi_status, ier)
-        call MPI_RECV (RGB_recv_ps_velocity_model(1,1), nspec_recv*((NGLLX-subsamp_postscript)/subsamp_postscript)*((NGLLX-subsamp_postscript)/subsamp_postscript), &
+        call MPI_RECV (RGB_recv_ps_velocity_model(1,1), nspec_recv*((NGLLX-subsamp_postscript)/subsamp_postscript)* &
+             ((NGLLX-subsamp_postscript)/subsamp_postscript), &
              MPI_DOUBLE_PRECISION, iproc, 42, MPI_COMM_WORLD, request_mpi_status, ier)
 
         buffer_offset = 0
@@ -1808,9 +1809,11 @@
      enddo
   else
      call MPI_SEND (nspec, 1, MPI_INTEGER, 0, 42, MPI_COMM_WORLD, ier)
-     call MPI_SEND (coorg_send_ps_velocity_model(1,1), 2*nspec*((NGLLX-subsamp_postscript)/subsamp_postscript)*((NGLLX-subsamp_postscript)/subsamp_postscript)*4, &
+     call MPI_SEND (coorg_send_ps_velocity_model(1,1), 2*nspec*((NGLLX-subsamp_postscript)/subsamp_postscript)* &
+          ((NGLLX-subsamp_postscript)/subsamp_postscript)*4, &
           MPI_DOUBLE_PRECISION, 0, 42, MPI_COMM_WORLD, ier)
-     call MPI_SEND (RGB_send_ps_velocity_model(1,1), nspec*((NGLLX-subsamp_postscript)/subsamp_postscript)*((NGLLX-subsamp_postscript)/subsamp_postscript), &
+     call MPI_SEND (RGB_send_ps_velocity_model(1,1), nspec*((NGLLX-subsamp_postscript)/subsamp_postscript)* &
+          ((NGLLX-subsamp_postscript)/subsamp_postscript), &
           MPI_DOUBLE_PRECISION, 0, 42, MPI_COMM_WORLD, ier)
   endif
 

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2011-11-30 17:16:03 UTC (rev 19255)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2011-12-01 00:24:33 UTC (rev 19256)
@@ -3849,10 +3849,12 @@
   if(modelvect) then
   d1_coorg_recv_ps_velocity_model=2
   call mpi_allreduce(nspec,d2_coorg_recv_ps_velocity_model,1,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD,ier)
-  d2_coorg_recv_ps_velocity_model=d2_coorg_recv_ps_velocity_model*((NGLLX-subsamp_postscript)/subsamp_postscript)*((NGLLX-subsamp_postscript)/subsamp_postscript)*4
+  d2_coorg_recv_ps_velocity_model=d2_coorg_recv_ps_velocity_model*((NGLLX-subsamp_postscript)/subsamp_postscript)* &
+       ((NGLLX-subsamp_postscript)/subsamp_postscript)*4
   d1_RGB_recv_ps_velocity_model=1
   call mpi_allreduce(nspec,d2_RGB_recv_ps_velocity_model,1,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD,ier)
-  d2_RGB_recv_ps_velocity_model=d2_RGB_recv_ps_velocity_model*((NGLLX-subsamp_postscript)/subsamp_postscript)*((NGLLX-subsamp_postscript)/subsamp_postscript)*4
+  d2_RGB_recv_ps_velocity_model=d2_RGB_recv_ps_velocity_model*((NGLLX-subsamp_postscript)/subsamp_postscript)* &
+       ((NGLLX-subsamp_postscript)/subsamp_postscript)*4
   else
   d1_coorg_recv_ps_velocity_model=1
   d2_coorg_recv_ps_velocity_model=1