[cig-commits] r22471 - in seismo/3D/SPECFEM3D_GLOBE: branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D trunk/src/meshfem3D trunk/src/shared trunk/src/specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Jun 30 19:01:51 PDT 2013
Author: dkomati1
Date: 2013-06-30 19:01:51 -0700 (Sun, 30 Jun 2013)
New Revision: 22471
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_missing_nodes.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_410_650.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_cmb.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_icb.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/calc_jacobian.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/define_superbrick.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/calendar.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/force_ftz.c
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/param_reader.c
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/reduce.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/rthetaphi_xyz.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/spline_routines.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/convert_time.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/define_derivation_matrices.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_cmt.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_event_info.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/noise_tomography.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/recompute_jacobian.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/reduce.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/get_event_info.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/noise_tomography.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/recompute_jacobian.f90
Log:
started to do a few obvious merges
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -232,21 +232,39 @@
print *,'approximate static memory needed by the solver:'
print *,'----------------------------------------------'
print *
- print *,'size of static arrays per slice = ',static_memory_size/1073741824.d0,' GB'
+ print *,'(lower bound, usually the real amount used is 5% to 10% higher)'
print *
-! note: using less memory becomes only an issue if the code scaling is bad.
-! most users will run simulations with an executable using far less than 80% RAM per core
-! since they prefer having a faster computational time (and use a higher number of cores).
-!! DK DK reply to note: yes, but that is not "green computing" at all!
-!! DK DK Thus one day people will probably need to worry about not wasting resources...
-! print *,' (should be below and typically equal to 80% or 90% of the memory installed per core)'
+ print *,'(you can get a more precise estimate of the size used per MPI process'
+ print *,' by typing "size -d bin/xspecfem3D"'
+ print *,' after compiling the code with the DATA/Par_file you plan to use)'
+ print *
+ print *,'size of static arrays per slice = ',static_memory_size/1.d6,' MB'
+ print *,' = ',static_memory_size/1048576.d0,' MiB'
+ print *,' = ',static_memory_size/1.d9,' GB'
+ print *,' = ',static_memory_size/1073741824.d0,' GiB'
+ print *
+
+! note: using less memory becomes an issue only if the strong scaling of the code is poor.
+! Some users will run simulations with an executable using far less than 80% RAM per core
+! if they prefer having a faster computational time (and use a higher number of cores).
+
print *,' (should be below 80% or 90% of the memory installed per core)'
print *,' (if significantly more, the job will not run by lack of memory)'
- print *,' (note that if significantly less, you waste a significant amount of memory per processor core)'
- print *,' (but that can be perfectly acceptable if you can afford it and want faster results by using more cores)'
+ print *,' (note that if significantly less, you waste a significant amount'
+ print *,' of memory per processor core)'
+ print *,' (but that can be perfectly acceptable if you can afford it and'
+ print *,' want faster results by using more cores)'
print *
- print *,'size of static arrays for all slices = ',static_memory_size*dble(NPROCTOT)/1073741824.d0,' GB'
- print *,' = ',static_memory_size*dble(NPROCTOT)/1099511627776.d0,' TB'
+ if(static_memory_size*dble(NPROCTOT)/1.d6 < 10000.d0) then
+ print *,'size of static arrays for all slices = ',static_memory_size*dble(NPROCTOT)/1.d6,' MB'
+ print *,' = ',static_memory_size*dble(NPROCTOT)/1048576.d0,' MiB'
+ print *,' = ',static_memory_size*dble(NPROCTOT)/1.d9,' GB'
+ else
+ print *,'size of static arrays for all slices = ',static_memory_size*dble(NPROCTOT)/1.d9,' GB'
+ endif
+ print *,' = ',static_memory_size*dble(NPROCTOT)/1073741824.d0,' GiB'
+ print *,' = ',static_memory_size*dble(NPROCTOT)/1.d12,' TB'
+ print *,' = ',static_memory_size*dble(NPROCTOT)/1099511627776.d0,' TiB'
print *
end program xcreate_header_file
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_missing_nodes.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_missing_nodes.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_missing_nodes.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_410_650.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_410_650.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_410_650.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_cmb.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_cmb.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_cmb.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -68,7 +68,7 @@
if(r >= RCMB/R_EARTH .and. r <= RTOPDDOUBLEPRIME/R_EARTH) then
! stretching between RCMB and RTOPDDOUBLEPRIME
gamma = (RTOPDDOUBLEPRIME/R_EARTH - r) / (RTOPDDOUBLEPRIME/R_EARTH - RCMB/R_EARTH)
- elseif(r>= r_start .and. r <= RCMB/R_EARTH) then
+ else if(r>= r_start .and. r <= RCMB/R_EARTH) then
! stretching between r_start and RCMB
gamma = (r - r_start) / (RCMB/R_EARTH - r_start)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_icb.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_icb.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography_icb.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -65,7 +65,7 @@
if(r > 0.0d0 .and. r <= RICB/R_EARTH) then
! stretching between center and RICB
gamma = r/(RICB/R_EARTH)
- elseif(r>= RICB/R_EARTH .and. r <= RCMB/R_EARTH) then
+ else if(r>= RICB/R_EARTH .and. r <= RCMB/R_EARTH) then
! stretching between RICB and RCMB
gamma = (r - RCMB/R_EARTH) / (RICB/R_EARTH - RCMB/R_EARTH)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/calc_jacobian.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/calc_jacobian.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/calc_jacobian.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -310,9 +310,10 @@
sumshape = sumshape + hlagrange
sumdershapexi = sumdershapexi + hlagrange_xi
sumdershapeeta = sumdershapeeta + hlagrange_eta
- end do
- end do
+ enddo
+ enddo
+
! Check the lagrange polynomial
if ( abs(xmesh - xelm2D(i,j)) > TINYVAL &
.or. abs(ymesh - yelm2D(i,j)) > TINYVAL &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/define_superbrick.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/define_superbrick.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/define_superbrick.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/calendar.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/calendar.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/calendar.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -455,10 +455,10 @@
!
! Explanation of all internal variables.
! jdref Julian Day on which 1 March begins in the reference year.
-! jmonth Month counter which equals month+1 if month .gt. 2
-! or month+13 if month .le. 2.
-! jyear Year index, jyear=iyear if iyear .gt. 0, jyear=iyear+1
-! if iyear .lt. 0. Thus, jyear does not skip year 0
+! jmonth Month counter which equals month+1 if month > 2
+! or month+13 if month <= 2.
+! jyear Year index, jyear=iyear if iyear > 0, jyear=iyear+1
+! if iyear < 0. Thus, jyear does not skip year 0
! like iyear does between BC and AD years.
! leap =1 if the year is a leap year, =0 if not.
! n1yr Number of complete individual years between iyear and
@@ -482,7 +482,7 @@
! this is 100*365 + 25 = 36525.
! nyrs Number of years from the beginning of yr400
! to the beginning of jyear. (Used for option +/-3).
-! yr400 The largest multiple of 400 years that is .le. jyear.
+! yr400 The largest multiple of 400 years that is <= jyear.
!
!
!----------------------------------------------------------------
@@ -502,7 +502,7 @@
if (abs(ioptn) <= 3) then
if (iyear > 0) then
jyear = iyear
- elseif (iyear == 0) then
+ else if (iyear == 0) then
write(*,*) 'For calndr(), you specified the nonexistent year 0'
stop
else
@@ -585,7 +585,7 @@
! OPTIONS -2 and +2:
! Given the day number of the year (idayct) and the year (iyear),
! compute the day of the month (iday) and the month (month).
- elseif (abs(ioptn) == 2) then
+ else if (abs(ioptn) == 2) then
!
if (idayct < 60+leap) then
month = (idayct-1)/31
@@ -604,7 +604,7 @@
! OPTIONS -3 and +3:
! Given a calendar date (iday,month,iyear), compute the Julian Day
! number (idayct) that starts at noon.
- elseif (abs(ioptn) == 3) then
+ else if (abs(ioptn) == 3) then
!
! Shift to a system where the year starts on 1 March, so January
! and February belong to the preceding year.
@@ -616,7 +616,7 @@
jmonth = month + 1
endif
!
-! Find the closest multiple of 400 years that is .le. jyear.
+! Find the closest multiple of 400 years that is <= jyear.
yr400 = (jyear/400)*400
! = multiple of 400 years at or less than jyear.
if (jyear < yr400) then
@@ -743,7 +743,7 @@
endif
endif
!
-! Adjust the year if it is .le. 0, and hence BC (Before Christ).
+! Adjust the year if it is <= 0, and hence BC (Before Christ).
if (iyear <= 0) then
iyear = iyear - 1
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/force_ftz.c
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/force_ftz.c 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/force_ftz.c 2013-07-01 02:01:51 UTC (rev 22471)
@@ -6,8 +6,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
- ! and University of Pau / CNRS / INRIA, France
- ! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+ ! and CNRS / INRIA / University of Pau, France
+ ! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/param_reader.c
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/param_reader.c 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/param_reader.c 2013-07-01 02:01:51 UTC (rev 22471)
@@ -6,8 +6,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
- ! and University of Pau / CNRS / INRIA, France
- ! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+ ! and CNRS / INRIA / University of Pau, France
+ ! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -45,8 +45,7 @@
any problems on that account. There are no wrapper functions used: just
the C routine called directly from a Fortran routine. Also, regarding
the use of C, I assumed this would not be a problem since there are
- already six C files that make up part of the build (though they all are
- related to the pyre-framework).
+ already a few C files that make up part of the build.
..
*/
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/reduce.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/reduce.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/reduce.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/rthetaphi_xyz.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/rthetaphi_xyz.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/rthetaphi_xyz.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/spline_routines.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/spline_routines.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/spline_routines.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/convert_time.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/convert_time.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/convert_time.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -84,10 +84,10 @@
if (mon == 2) then
if (is_leap_year(yr) .and. (day < 1 .or. day > 29)) then
stop 'Error in convtime: February day out of range (1-29)'
- elseif (.not. is_leap_year(yr) .and. (day < 1 .or. day > 28)) then
+ else if (.not. is_leap_year(yr) .and. (day < 1 .or. day > 28)) then
stop 'Error in convtime: February day out of range (1-28)'
endif
- elseif (mon == 4 .or. mon == 6 .or. mon == 9 .or. mon == 11) then
+ else if (mon == 4 .or. mon == 6 .or. mon == 9 .or. mon == 11) then
if (day < 1 .or. day > 30) stop 'Error in convtime: day out of range (1-30)'
else
if (day < 1 .or. day > 31) stop 'Error in convtime: day out of range (1-31)'
@@ -214,7 +214,7 @@
tmon=itime-leap_mon(imon)
if (tmon > 0) then
goto 30
- elseif (tmon < 0) then
+ else if (tmon < 0) then
imon=imon-1
itime=itime-month(imon)
else
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/define_derivation_matrices.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/define_derivation_matrices.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/define_derivation_matrices.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,9 @@
!=====================================================================
subroutine define_derivation_matrices(xigll,yigll,zigll,wxgll,wygll,wzgll, &
- hprime_xx,hprime_yy,hprime_zz, &
- hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
- wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube)
+ hprime_xx,hprime_yy,hprime_zz, &
+ hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
+ wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube)
implicit none
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_cmt.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_cmt.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_cmt.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_event_info.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_event_info.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/get_event_info.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/noise_tomography.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/noise_tomography.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/noise_tomography.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/recompute_jacobian.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/recompute_jacobian.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/recompute_jacobian.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -5,8 +5,8 @@
!
! Main authors: Dimitri Komatitsch and Jeroen Tromp
! Princeton University, USA
-! and University of Pau / CNRS / INRIA, France
-! (c) Princeton University / California Institute of Technology and University of Pau / CNRS / INRIA
+! and CNRS / INRIA / University of Pau, France
+! (c) Princeton University and CNRS / INRIA / University of Pau
! April 2011
!
! This program is free software; you can redistribute it and/or modify
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -53,7 +53,9 @@
! input parameter
integer::myrank,ispec,nspec
+
double precision, dimension(NGLLX,NGLLY,NGLLZ,nspec) :: xstore,ystore,zstore
+
double precision, dimension(NGLLX):: xigll
double precision, dimension(NGLLY):: yigll
double precision, dimension(NGLLZ):: zigll
@@ -62,9 +64,8 @@
! output results
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,nspec) :: &
- xixstore,xiystore,xizstore,&
- etaxstore,etaystore,etazstore,&
- gammaxstore,gammaystore,gammazstore
+ xixstore,xiystore,xizstore,etaxstore,etaystore,etazstore,&
+ gammaxstore,gammaystore,gammazstore
! local parameters for this subroutine
@@ -89,15 +90,15 @@
do j=1,NGLLY
do i=1,NGLLX
- xxi = 0.0
- xeta = 0.0
- xgamma = 0.0
- yxi = 0.0
- yeta = 0.0
- ygamma = 0.0
- zxi = 0.0
- zeta = 0.0
- zgamma = 0.0
+ xxi = ZERO
+ xeta = ZERO
+ xgamma = ZERO
+ yxi = ZERO
+ yeta = ZERO
+ ygamma = ZERO
+ zxi = ZERO
+ zeta = ZERO
+ zgamma = ZERO
xi = xigll(i)
eta = yigll(j)
@@ -108,14 +109,14 @@
call lagrange_any(eta,NGLLY,yigll,hetar,hpetar)
call lagrange_any(gamma,NGLLZ,zigll,hgammar,hpgammar)
- ! test parameters
- sumshape = 0.0
- sumdershapexi = 0.0
- sumdershapeeta = 0.0
- sumdershapegamma = 0.0
- xmesh = 0.0
- ymesh = 0.0
- zmesh = 0.0
+ ! test parameters
+ sumshape = ZERO
+ sumdershapexi = ZERO
+ sumdershapeeta = ZERO
+ sumdershapegamma = ZERO
+ xmesh = ZERO
+ ymesh = ZERO
+ zmesh = ZERO
do k1 = 1,NGLLZ
@@ -267,12 +268,12 @@
do j = 1,NGLLB
do i = 1,NGLLA
- xxi = 0.0
- xeta = 0.0
- yxi = 0.0
- yeta = 0.0
- zxi = 0.0
- zeta = 0.0
+ xxi = ZERO
+ xeta = ZERO
+ yxi = ZERO
+ yeta = ZERO
+ zxi = ZERO
+ zeta = ZERO
xi=xigll(i)
eta = yigll(j)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/reduce.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/reduce.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/reduce.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -33,19 +33,21 @@
include "constants.h"
- double precision theta,phi
+ double precision :: theta,phi
- integer i
- double precision th,ph
+ integer :: i
+ double precision :: th,ph
th=theta
ph=phi
i=abs(int(ph/TWO_PI))
+
if(ph<ZERO) then
ph=ph+(i+1)*TWO_PI
else
if(ph>TWO_PI) ph=ph-i*TWO_PI
endif
+
phi=ph
if(th<ZERO .or. th>PI) then
i=int(th/PI)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/get_event_info.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/get_event_info.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/get_event_info.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -233,6 +233,7 @@
read(821,"(a)") string
read(821,"(a)") string
enddo
+
! sets tshift_cmt to zero
tshift_cmt = 0.
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/noise_tomography.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/noise_tomography.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/noise_tomography.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -34,6 +34,7 @@
! for a given point (xcoord,ycoord,zcoord), specify the noise direction "normal_x/y/z_noise"
! and noise distribution "mask_noise"
! USERS need to modify this subroutine for their own noise characteristics
+
subroutine noise_distribution_direction(xcoord_in,ycoord_in,zcoord_in, &
normal_x_noise_out,normal_y_noise_out,normal_z_noise_out, &
mask_noise_out)
@@ -69,9 +70,9 @@
end subroutine noise_distribution_direction
-! =============================================================================================================
-! =============================================================================================================
-! =============================================================================================================
+!
+!-------------------------------------------------------------------------------------------------
+!
! subroutine for NOISE TOMOGRAPHY
! read parameters
@@ -143,7 +144,7 @@
! noise distribution and noise direction
ipoin = 0
- do ispec2D = 1, nspec_top ! NSPEC2D_TOP(IREGION_CRUST_MANTLE)
+ do ispec2D = 1, NSPEC_TOP ! NSPEC2D_TOP(IREGION_CRUST_MANTLE)
ispec = ibelm_top_crust_mantle(ispec2D)
k = NGLLZ
@@ -169,7 +170,7 @@
!!!BEGIN!!! save mask_noise for check, a file called "mask_noise" is saved in "./OUTPUT_FIELS/"
ipoin = 0
- do ispec2D = 1, nspec_top ! NSPEC2D_TOP(IREGION_CRUST_MANTLE)
+ do ispec2D = 1, NSPEC_TOP ! NSPEC2D_TOP(IREGION_CRUST_MANTLE)
ispec = ibelm_top_crust_mantle(ispec2D)
k = NGLLZ
! loop on all the points inside the element
@@ -218,9 +219,9 @@
end subroutine read_parameters_noise
-! =============================================================================================================
-! =============================================================================================================
-! =============================================================================================================
+!
+!-------------------------------------------------------------------------------------------------
+!
! subroutine for NOISE TOMOGRAPHY
! check for consistency of the parameters
@@ -313,12 +314,14 @@
end subroutine check_parameters_noise
-! =============================================================================================================
-! =============================================================================================================
-! =============================================================================================================
+!
+!-------------------------------------------------------------------------------------------------
+!
! subroutine for NOISE TOMOGRAPHY
-! read and construct the "source" (source time function based upon noise spectrum) for "ensemble forward source"
+! read and construct the "source" (source time function based upon noise spectrum)
+! for "ensemble forward source"
+
subroutine compute_arrays_source_noise(myrank, &
xi_noise,eta_noise,gamma_noise,nu_single,noise_sourcearray, &
xigll,yigll,zigll,NSTEP)
@@ -403,9 +406,9 @@
end subroutine compute_arrays_source_noise
-! =============================================================================================================
-! =============================================================================================================
-! =============================================================================================================
+!
+!-------------------------------------------------------------------------------------------------
+!
! subroutine for NOISE TOMOGRAPHY
! step 1: calculate the "ensemble forward source"
@@ -444,9 +447,9 @@
end subroutine add_source_master_rec_noise
-! =============================================================================================================
-! =============================================================================================================
-! =============================================================================================================
+!
+!-------------------------------------------------------------------------------------------------
+!
! subroutine for NOISE TOMOGRAPHY
! step 1: calculate the "ensemble forward source"
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/recompute_jacobian.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/recompute_jacobian.f90 2013-07-01 01:39:52 UTC (rev 22470)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/recompute_jacobian.f90 2013-07-01 02:01:51 UTC (rev 22471)
@@ -28,7 +28,7 @@
! recompute 3D jacobian at a given point for 27-node elements
subroutine recompute_jacobian(xelm,yelm,zelm,xi,eta,gamma,x,y,z, &
- xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz)
+ xix,xiy,xiz,etax,etay,etaz,gammax,gammay,gammaz)
implicit none
More information about the CIG-COMMITS
mailing list