[cig-commits] r22465 - in seismo/3D/SPECFEM3D_GLOBE: branches/SPECFEM3D_GLOBE_SUNFLOWER/setup branches/SPECFEM3D_GLOBE_SUNFLOWER/utils/Cluster/estimate_best_values_runs trunk/setup trunk/utils/Cluster/estimate_best_values_runs trunk/utils/adjoint_sources/amplitude trunk/utils/adjoint_sources/traveltime

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2013-06-30 18:14:19 -0700 (Sun, 30 Jun 2013)
New Revision: 22465

Removed:
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/utils/Cluster/estimate_best_values_runs/DATA
   seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Cluster/estimate_best_values_runs/DATA
Modified:
   seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/setup/config.h.in
   seismo/3D/SPECFEM3D_GLOBE/trunk/setup/config.h.in
   seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/amplitude/create_adjsrc_amplitude.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/traveltime/create_adjsrc_traveltime.f90
Log:
more merging


Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/setup/config.h.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/setup/config.h.in	2013-07-01 01:01:20 UTC (rev 22464)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/setup/config.h.in	2013-07-01 01:14:19 UTC (rev 22465)
@@ -62,6 +62,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

Deleted: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/utils/Cluster/estimate_best_values_runs/DATA
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/utils/Cluster/estimate_best_values_runs/DATA	2013-07-01 01:01:20 UTC (rev 22464)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/utils/Cluster/estimate_best_values_runs/DATA	2013-07-01 01:14:19 UTC (rev 22465)
@@ -1 +0,0 @@
-link ../../../DATA/
\ No newline at end of file

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/setup/config.h.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/setup/config.h.in	2013-07-01 01:01:20 UTC (rev 22464)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/setup/config.h.in	2013-07-01 01:14:19 UTC (rev 22465)
@@ -1,5 +1,8 @@
 /* setup/config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* configuration flags to be save in the adios output file. */
+#undef CONFIGURE_FLAGS
+
 /* Define to dummy `main' function (if any) required to link to the Fortran
    libraries. */
 #undef FC_DUMMY_MAIN
@@ -67,3 +70,9 @@
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
+
+
+/* Uncomment and define to select optimized file i/o for regional simulations */
+/* map fails when output files are > 4GB, which is often the case for GPU simulations */
+/* #define USE_MAP_FUNCTION */
+

Deleted: seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Cluster/estimate_best_values_runs/DATA
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Cluster/estimate_best_values_runs/DATA	2013-07-01 01:01:20 UTC (rev 22464)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/utils/Cluster/estimate_best_values_runs/DATA	2013-07-01 01:14:19 UTC (rev 22465)
@@ -1 +0,0 @@
-link ../../../DATA/
\ No newline at end of file

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/amplitude/create_adjsrc_amplitude.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/amplitude/create_adjsrc_amplitude.f90	2013-07-01 01:01:20 UTC (rev 22464)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/amplitude/create_adjsrc_amplitude.f90	2013-07-01 01:14:19 UTC (rev 22465)
@@ -13,10 +13,18 @@
   integer :: i, is, ie, nstep, j, itime ,ifile,ios, i1, i2, nstep_old
   character(len=256) :: arg(100), file(100)
   character(len=256) :: filename
-  integer,parameter :: NMAX = 30000
+  
   real*8, parameter :: EPS = 1.0d-17
   real*8, parameter :: PI = 3.1415926d0
-  real*8 :: ts, te, data(5,NMAX), out(NMAX), adj(NMAX), tw(NMAX), norm
+  real*8 :: ts, te, norm
+
+  ! seismogram arrays
+  integer,parameter :: NMAX = 90000
+  real*8 :: data(5,NMAX)
+  real*8 :: out(NMAX)
+  real*8 :: adj(NMAX)
+  real*8 :: tw(NMAX)
+  
   real*8 :: dt, t0, t0_old, dt_old, costh, sinth, th, baz
   logical :: lrot
 

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/traveltime/create_adjsrc_traveltime.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/traveltime/create_adjsrc_traveltime.f90	2013-07-01 01:01:20 UTC (rev 22464)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/utils/adjoint_sources/traveltime/create_adjsrc_traveltime.f90	2013-07-01 01:14:19 UTC (rev 22465)
@@ -12,10 +12,18 @@
   integer :: i, is, ie, nstep, j, itime ,ifile,ios, i1, i2, nstep_old
   character(len=256) :: arg(100), file(100)
   character(len=256) :: filename
-  integer,parameter :: NMAX = 30000
+
   real*8, parameter :: EPS = 1.0d-17
   real*8, parameter :: PI = 3.1415926d0
-  real*8 :: ts, te, data(5,NMAX), out(NMAX), adj(NMAX), tw(NMAX), norm
+  real*8 :: ts, te, norm
+
+  ! seismogram arrays
+  integer,parameter :: NMAX = 90000
+  real*8 :: data(5,NMAX)
+  real*8 :: out(NMAX)
+  real*8 :: adj(NMAX)
+  real*8 :: tw(NMAX)
+
   real*8 :: dt, t0, t0_old, dt_old, costh, sinth, th, baz
   logical :: lrot