[cig-commits] [commit] devel: added calculation of the estimated day and time at which the run will finish; taken from SPECFEM3D_GLOBE; useful for large runs (aad4eb9)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Sep 16 11:07:37 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/27c70c5c56f96bc7798b66bffb0b95d4c9783d30...aad4eb97227c36e1cd6293a2f0109990b4e5b30b
>---------------------------------------------------------------
commit aad4eb97227c36e1cd6293a2f0109990b4e5b30b
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Tue Sep 16 19:57:51 2014 +0200
added calculation of the estimated day and time at which the run will finish; taken from SPECFEM3D_GLOBE; useful for large runs
>---------------------------------------------------------------
aad4eb97227c36e1cd6293a2f0109990b4e5b30b
setup/constants.h.in | 15 +
src/shared/get_cmt.f90 | 2 +-
src/specfem3D/calendar.f90 | 718 ++++++++++++++++++++++++++++++++
src/specfem3D/check_stability.f90 | 120 +++++-
src/specfem3D/convert_time.f90 | 269 ++++++++++++
src/specfem3D/initialize_simulation.f90 | 4 +-
src/specfem3D/read_mesh_databases.F90 | 9 +-
src/specfem3D/rules.mk | 4 +
8 files changed, 1125 insertions(+), 16 deletions(-)
diff --git a/setup/constants.h.in b/setup/constants.h.in
index 1c9dbcb..f43bd86 100644
--- a/setup/constants.h.in
+++ b/setup/constants.h.in
@@ -537,3 +537,18 @@
integer, parameter :: IMODEL_IPATI = 10
integer, parameter :: IMODEL_IPATI_WATER = 11
+!!-----------------------------------------------------------
+!!
+!! time stamp information
+!!
+!!-----------------------------------------------------------
+
+! print date and time estimate of end of run in another country,
+! in addition to local time.
+! For instance: the code runs at Caltech in California but the person
+! running the code is connected remotely from France, which has 9 hours more.
+! The time difference with that remote location can be positive or negative
+ logical, parameter :: ADD_TIME_ESTIMATE_ELSEWHERE = .false.
+ integer, parameter :: HOURS_TIME_DIFFERENCE = +9
+ integer, parameter :: MINUTES_TIME_DIFFERENCE = +0
+
diff --git a/src/shared/get_cmt.f90 b/src/shared/get_cmt.f90
index 73b0ca7..c2f0261 100644
--- a/src/shared/get_cmt.f90
+++ b/src/shared/get_cmt.f90
@@ -177,7 +177,7 @@
integer yr,mo,da
integer mon(12)
- integer lpyr
+ integer, external :: lpyr
data mon /0,31,59,90,120,151,181,212,243,273,304,334/
julian_day = da + mon(mo)
diff --git a/src/specfem3D/calendar.f90 b/src/specfem3D/calendar.f90
new file mode 100644
index 0000000..aba4bfb
--- /dev/null
+++ b/src/specfem3D/calendar.f90
@@ -0,0 +1,718 @@
+!=====================================================================
+!
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
+!
+! Main historical authors: Dimitri Komatitsch and Jeroen Tromp
+! Princeton University, USA
+! and CNRS / University of Marseille, France
+! (there are currently many more authors!)
+! (c) Princeton University and CNRS / University of Marseille, July 2012
+!
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License along
+! with this program; if not, write to the Free Software Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+!=====================================================================
+
+! function to determine if year is a leap year
+ logical function is_leap_year(yr)
+
+ implicit none
+
+ integer yr
+
+ integer, external :: lpyr
+
+!---- function lpyr above returns 1 if leap year
+ if (lpyr(yr) == 1) then
+ is_leap_year = .true.
+ else
+ is_leap_year = .false.
+ endif
+
+ end function is_leap_year
+
+
+!----------------------------------------------------------------------------------------------
+! open-source subroutines below taken from ftp://ftp.met.fsu.edu/pub/ahlquist/calendar_software
+!----------------------------------------------------------------------------------------------
+
+ integer function idaywk(jdayno)
+
+! IDAYWK = compute the DAY of the WeeK given the Julian Day number,
+! version 1.0.
+
+ implicit none
+
+! Input variable
+ integer, intent(in) :: jdayno
+! jdayno = Julian Day number starting at noon of the day in question.
+
+! Output of the function:
+! idaywk = day of the week, where 0=Sunday, 1=Monday, ..., 6=Saturday.
+
+!----------
+! Compute the day of the week given the Julian Day number.
+! You can find the Julian Day number given (day,month,year)
+! using subroutine calndr below.
+! Example: For the first day of the Gregorian calendar,
+! Friday 15 October 1582, compute the Julian day number (option 3 of
+! subroutine calndr) and compute the day of the week.
+! call calndr (3, 15, 10, 1582, jdayno)
+! write(*,*) jdayno, idaywk(jdayno)
+! The numbers printed should be 2299161 and 5, where 5 refers to Friday.
+!
+! Copyright (C) 1999 Jon Ahlquist.
+! Issued under the second GNU General Public License.
+! See www.gnu.org for details.
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+! If you find any errors, please notify:
+! Jon Ahlquist <ahlquist at met.fsu.edu>
+! Dept of Meteorology
+! Florida State University
+! Tallahassee, FL 32306-4520
+! 15 March 1999.
+!
+!-----
+
+! converted to Fortran90 by Dimitri Komatitsch,
+! University of Pau, France, January 2008.
+
+! jdSun is the Julian Day number starting at noon on any Sunday.
+! I arbitrarily chose the first Sunday after Julian Day 1,
+! which is Julian Day 6.
+ integer, parameter :: jdSun = 6
+
+ idaywk = mod(jdayno-jdSun,7)
+
+! If jdayno-jdSun < 0, then we are taking the modulus of a negative
+! number. Fortran's built-in mod function returns a negative value
+! when the argument is negative. In that case, we adjust the result
+! to a positive value.
+ if (idaywk < 0) idaywk = idaywk + 7
+
+ end function idaywk
+
+!
+!----
+!
+
+ subroutine calndr(iday,month,iyear,idayct)
+
+! CALNDR = CALeNDaR conversions, version 1.0
+
+ implicit none
+
+! specify the desired calendar conversion option.
+! in order to return the julian day number, compatible with function idaywk from above,
+! we choose option 3
+! (tested with dates: Feb, 23 2010 -> idaywk = Tue
+! Dec, 24 2009 -> idaywk = Thu
+! Oct, 15 1582 -> idaywk = Fri ...which all look o.k. )
+ integer, parameter :: ioptn = 3
+
+! Input/Output variables
+ integer, intent(inout) :: iday,month,iyear,idayct
+
+!----------
+!
+! Subroutine calndr() performs calendar calculations using either
+! the standard Gregorian calendar or the old Julian calendar.
+! This subroutine extends the definitions of these calendar systems
+! to any arbitrary year. The algorithms in this subroutine
+! will work with any date in the past or future,
+! but overflows will occur if the numbers are sufficiently large.
+! For a computer using a 32-bit integer, this routine can handle
+! any date between roughly 5.8 million BC and 5.8 million AD
+! without experiencing overflow during calculations.
+!
+! No external functions or subroutines are called.
+!
+!----------
+!
+! INPUT/OUTPUT ARGUMENTS FOR SUBROUTINE CALNDR()
+!
+! "ioptn" is the desired calendar conversion option explained below.
+! Positive option values use the standard modern Gregorian calendar.
+! Negative option values use the old Julian calendar which was the
+! standard in Europe from its institution by Julius Caesar in 45 BC
+! until at least 4 October 1582. The Gregorian and Julian calendars
+! are explained further below.
+!
+! (iday,month,iyear) is a calendar date where "iday" is the day of
+! the month, "month" is 1 for January, 2 for February, etc.,
+! and "iyear" is the year. If the year is 1968 AD, enter iyear=1968,
+! since iyear=68 would refer to 68 AD.
+! For BC years, iyear should be negative, so 45 BC would be iyear=-45.
+! By convention, there is no year 0 under the BC/AD year numbering
+! scheme. That is, years proceed as 2 BC, 1 BC, 1 AD, 2 AD, etc.,
+! without including 0. Subroutine calndr() will print an error message
+! and stop if you specify iyear = 0.
+!
+! "idayct" is a day count. It is either the day number during the
+! specified year or the Julian Day number, depending on the value
+! of ioptn. By day number during the specified year, we mean
+! idayct=1 on 1 January, idayct=32 on 1 February, etc., to idayct=365
+! or 366 on 31 December, depending on whether the specified year
+! is a leap year.
+!
+! The values of input variables are not changed by this subroutine.
+!
+!
+! ALLOWABLE VALUES FOR "IOPTN" and the conversions they invoke.
+! Positive option values ( 1 to 5) use the standard Gregorian calendar.
+! Negative option values (-1 to -5) use the old Julian calendar.
+!
+! Absolute
+! value
+! of ioptn Input variable(s) Output variable(s)
+!
+! 1 iday,month,iyear idayct
+! Given a calendar date (iday,month,iyear), compute the day number
+! (idayct) during the year, where 1 January is day number 1 and
+! 31 December is day number 365 or 366, depending on whether it is
+! a leap year.
+!
+! 2 idayct,iyear iday,month
+! Given the day number of the year (idayct) and the year (iyear),
+! compute the day of the month (iday) and the month (month).
+!
+! 3 iday,month,iyear idayct
+! Given a calendar date (iday,month,iyear), compute the Julian Day
+! number (idayct) that starts at noon of the calendar date specified.
+!
+! 4 idayct iday,month,iyear
+! Given the Julian Day number (idayct) that starts at noon,
+! compute the corresponding calendar date (iday,month,iyear).
+!
+! 5 idayct iday,month,iyear
+! Given the Julian Day number (idayct) that starts at noon,
+! compute the corresponding day number for the year (iday)
+! and year (iyear). On return from calndr(), "month" will always
+! be set equal to 1 when ioptn=5.
+!
+! No inverse function is needed for ioptn=5 because it is
+! available through option 3. One simply calls calndr() with:
+! ioptn = 3,
+! iday = day number of the year instead of day of the month,
+! month = 1, and
+! iyear = whatever the desired year is.
+!
+!----------
+!
+! EXAMPLES
+! The first 6 examples are for the standard Gregorian calendar.
+! All the examples deal with 15 October 1582, which was the first day
+! of the Gregorian calendar. 15 October is the 288-th day of the year.
+! Julian Day number 2299161 began at noon on 15 October 1582.
+!
+! Find the day number during the year on 15 October 1582
+! ioptn = 1
+! call calndr (ioptn, 15, 10, 1582, idayct)
+! calndr() should return idayct=288
+!
+! Find the day of the month and month for day 288 in year 1582.
+! ioptn = 2
+! call calndr (ioptn, iday, month, 1582, 288)
+! calndr() should return iday=15 and month=10.
+!
+! Find the Julian Day number for 15 October 1582.
+! ioptn = 3
+! call calndr (ioptn, 15, 10, 1582, julian)
+! calndr() should return julian=2299161
+!
+! Find the Julian Day number for day 288 during 1582 AD.
+! When the input is day number of the year, one should specify month=1
+! ioptn = 3
+! call calndr (ioptn, 288, 1, 1582, julian)
+! calndr() should return dayct=2299161
+!
+! Find the date for Julian Day number 2299161.
+! ioptn = 4
+! call calndr (ioptn, iday, month, iyear, 2299161)
+! calndr() should return iday=15, month=10, and iyear=1582
+!
+! Find the day number during the year (iday) and year
+! for Julian Day number 2299161.
+! ioptn = 5
+! call calndr (ioptn, iday, month, iyear, 2299161)
+! calndr() should return iday=288, month = 1, iyear=1582
+!
+! Given 15 October 1582 under the Gregorian calendar,
+! find the date (idayJ,imonthJ,iyearJ) under the Julian calendar.
+! To do this, we call calndr() twice, using the Julian Day number
+! as the intermediate value.
+! call calndr ( 3, 15, 10, 1582, julian)
+! call calndr (-4, idayJ, monthJ, iyearJ, julian)
+! The first call to calndr() should return julian=2299161, and
+! the second should return idayJ=5, monthJ=10, iyearJ=1582
+!
+!----------
+!
+! BASIC CALENDAR INFORMATION
+!
+! The Julian calendar was instituted by Julius Caesar in 45 BC.
+! Every fourth year is a leap year in which February has 29 days.
+! That is, the Julian calendar assumes that the year is exactly
+! 365.25 days long. Actually, the year is not quite this long.
+! The modern Gregorian calendar remedies this by omitting leap years
+! in years divisible by 100 except when the year is divisible by 400.
+! Thus, 1700, 1800, and 1900 are leap years under the Julian calendar
+! but not under the Gregorian calendar. The years 1600 and 2000 are
+! leap years under both the Julian and the Gregorian calendars.
+! Other years divisible by 4 are leap years under both calendars,
+! such as 1992, 1996, 2004, 2008, 2012, etc. For BC years, we recall
+! that year 0 was omitted, so 1 BC, 5 BC, 9 BC, 13 BC, etc., and 401 BC,
+! 801 BC, 1201 BC, etc., are leap years under both calendars, while
+! 101 BC, 201 BC, 301 BC, 501 BC, 601 BC, 701 BC, 901 BC, 1001 BC,
+! 1101 BC, etc., are leap years under the Julian calendar but not
+! the Gregorian calendar.
+!
+! The Gregorian calendar is named after Pope Gregory XIII. He declared
+! that the last day of the old Julian calendar would be Thursday,
+! 4 October 1582 and that the following day, Friday, would be reckoned
+! under the new calendar as 15 October 1582. The jump of 10 days was
+! included to make 21 March closer to the spring equinox.
+!
+! Only a few Catholic countries (Italy, Poland, Portugal, and Spain)
+! switched to the Gregorian calendar on the day after 4 October 1582.
+! It took other countries months to centuries to change to the
+! Gregorian calendar. For example, England's first day under the
+! Gregorian calendar was 14 September 1752. The same date applied to
+! the entire British empire, including America. Japan, Russia, and many
+! eastern European countries did not change to the Gregorian calendar
+! until the 20th century. The last country to change was Turkey,
+! which began using the Gregorian calendar on 1 January 1927.
+!
+! Therefore, between the years 1582 and 1926 AD, you must know
+! the country in which an event was dated to interpret the date
+! correctly. In Sweden, there was even a year (1712) when February
+! had 30 days. Consult a book on calendars for more details
+! about when various countries changed their calendars.
+!
+! DAY NUMBER DURING THE YEAR
+! The day number during the year is simply a counter equal to 1 on
+! 1 January, 32 on 1 February, etc., through 365 or 366 on 31 December,
+! depending on whether the year is a leap year. Sometimes this is
+! called the Julian Day, but that term is better reserved for the
+! day counter explained below.
+!
+! JULIAN DAY NUMBER
+! The Julian Day numbering system was designed by Joseph Scaliger
+! in 1582 to remove ambiguity caused by varying calendar systems.
+! The name "Julian Day" was chosen to honor Scaliger's father,
+! Julius Caesar Scaliger (1484-1558), an Italian scholar and physician
+! who lived in France. Because Julian Day numbering was especially
+! designed for astronomers, Julian Days begin at noon so that the day
+! counter does not change in the middle of an astronomer's observing
+! period. Julian Day 0 began at noon on 1 January 4713 BC under the
+! Julian calendar. A modern reference point is that 23 May 1968
+! (Gregorian calendar) was Julian Day 2,440,000.
+!
+! JULIAN DAY NUMBER EXAMPLES
+!
+! The table below shows a few Julian Day numbers and their corresponding
+! dates, depending on which calendar is used. A negative 'iyear' refers
+! to BC (Before Christ).
+!
+! Julian Day under calendar:
+! iday month iyear Gregorian Julian
+! 24 11 -4714 0 -38
+! 1 1 -4713 38 0
+! 1 1 1 1721426 1721424
+! 4 10 1582 2299150 2299160
+! 15 10 1582 2299161 2299171
+! 1 3 1600 2305508 2305518
+! 23 5 1968 2440000 2440013
+! 5 7 1998 2451000 2451013
+! 1 3 2000 2451605 2451618
+! 1 1 2001 2451911 2451924
+!
+! From this table, we can see that the 10 day difference between the
+! two calendars in 1582 grew to 13 days by 1 March 1900, since 1900 was
+! a leap year under the Julian calendar but not under the Gregorian
+! calendar. The gap will widen to 14 days after 1 March 2100 for the
+! same reason.
+!
+!----------
+!
+! PORTABILITY
+!
+! This subroutine is written in standard FORTRAN 90.
+! It calls no external functions or subroutines and should run
+! without problem on any computer having a 32-bit word or longer.
+!
+!----------
+!
+! ALGORITHM
+!
+! The goal in coding calndr() was clear, clean code, not efficiency.
+! Calendar calculations usually take a trivial fraction of the time
+! in any program in which dates conversions are involved.
+! Data analysis usually takes the most time.
+!
+! Standard algorithms are followed in this subroutine. Internal to
+! this subroutine, we use a year counter "jyear" such that
+! jyear=iyear when iyear is positive
+! =iyear+1 when iyear is negative.
+! Thus, jyear does not experience a 1 year jump like iyear does
+! when going from BC to AD. Specifically, jyear = 0 when iyear=-1,
+! i.e., when the year is 1 BC.
+!
+! For simplicity in dealing with February, inside this subroutine,
+! we let the year begin on 1 March so that the adjustable month,
+! February is the last month of the year.
+! It is clear that the calendar used to work this way because the
+! months September, October, November, and December refer to
+! 7, 8, 9, and 10. For consistency, jyear is incremented on 1 March
+! rather than on 1 January. Of course, everything is adjusted back to
+! standard practice of years beginning on 1 January before answers
+! are returned to the routine that calls calndr().
+!
+! Lastly, we use a trick to calculate the number of days from 1 March
+! until the end of the month that precedes the specified month.
+! That number of days is int(30.6001*(month+1))-122,
+! where 30.6001 is used to avoid the possibility of round-off and
+! truncation error. For example, if 30.6 were used instead,
+! 30.6*5 should be 153, but round-off error could make it 152.99999,
+! which would then truncated to 152, causing an error of 1 day.
+!
+! Algorithm reference:
+! Dershowitz, Nachum and Edward M. Reingold, 1990: Calendrical
+! Calculations. Software-Practice and Experience, vol. 20, number 9
+! (September 1990), pp. 899-928.
+!
+! Copyright (C) 1999 Jon Ahlquist.
+! Issued under the second GNU General Public License.
+! See www.gnu.org for details.
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+! If you find any errors, please notify:
+! Jon Ahlquist <ahlquist at met.fsu.edu>
+! Dept of Meteorology
+! Florida State University
+! Tallahassee, FL 32306-4520
+! 15 March 1999.
+!
+!-----
+
+! converted to Fortran90 by Dimitri Komatitsch,
+! University of Pau, France, January 2008.
+
+! Declare internal variables.
+ integer jdref, jmonth, jyear, leap, n1yr, n4yr, n100yr, n400yr, ndays, ndy400, ndy100, nyrs, yr400, yrref
+!
+! 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 > 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
+! the reference year after all 4, 100,
+! and 400 year periods have been removed.
+! n4yr Number of complete 4 year cycles between iyear and
+! the reference year after all 100 and 400 year periods
+! have been removed.
+! n100yr Number of complete 100 year periods between iyear and
+! the reference year after all 400 year periods
+! have been removed.
+! n400yr Number of complete 400 year periods between iyear and
+! the reference year.
+! ndays Number of days since 1 March during iyear. (In intermediate
+! steps, it holds other day counts as well.)
+! ndy400 Number of days in 400 years. Under the Gregorian calendar,
+! this is 400*365 + 100 - 3 = 146097. Under the Julian
+! calendar, this is 400*365 + 100 = 146100.
+! ndy100 Number of days in 100 years, Under the Gregorian calendar,
+! this is 100*365 + 24 = 36524. Under the Julian calendar,
+! 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 <= jyear.
+!
+!
+!----------------------------------------------------------------
+! Do preparation work.
+!
+! Look for out-of-range option values.
+ if ((ioptn == 0) .or. (abs(ioptn) >= 6)) then
+ write(*,*)'For calndr(), you specified ioptn = ', ioptn
+ write(*,*) 'Allowable values are 1 to 5 for the Gregorian calendar'
+ write(*,*) 'and -1 to -5 for the Julian calendar.'
+ stop
+ endif
+!
+! Options 1-3 have "iyear" as an input value.
+! Internally, we use variable "jyear" that does not have a jump
+! from -1 (for 1 BC) to +1 (for 1 AD).
+ if (abs(ioptn) <= 3) then
+ if (iyear > 0) then
+ jyear = iyear
+ else if (iyear == 0) then
+ write(*,*) 'For calndr(), you specified the nonexistent year 0'
+ stop
+ else
+ jyear = iyear + 1
+ endif
+!
+! Set "leap" equal to 0 if "jyear" is not a leap year
+! and equal to 1 if it is a leap year.
+ leap = 0
+ if ((jyear/4)*4 == jyear) then
+ leap = 1
+ endif
+ if ((ioptn > 0) .and. &
+ ((jyear/100)*100 == jyear) .and. &
+ ((jyear/400)*400 /= jyear) ) then
+ leap = 0
+ endif
+ endif
+!
+! Options 3-5 involve Julian Day numbers, which need a reference year
+! and the Julian Days that began at noon on 1 March of the reference
+! year under the Gregorian and Julian calendars. Any year for which
+! "jyear" is divisible by 400 can be used as a reference year.
+! We chose 1600 AD as the reference year because it is the closest
+! multiple of 400 to the institution of the Gregorian calendar, making
+! it relatively easy to compute the Julian Day for 1 March 1600
+! given that, on 15 October 1582 under the Gregorian calendar,
+! the Julian Day was 2299161. Similarly, we need to do the same
+! calculation for the Julian calendar. We can compute this Julian
+! Day knowing that on 4 October 1582 under the Julian calendar,
+! the Julian Day number was 2299160. The details of these calculations
+! is next.
+! From 15 October until 1 March, the number of days is the remainder
+! of October plus the days in November, December, January, and February:
+! 17+30+31+31+28 = 137, so 1 March 1583 under the Gregorian calendar
+! was Julian Day 2,299,298. Because of the 10 day jump ahead at the
+! switch from the Julian calendar to the Gregorian calendar, 1 March
+! 1583 under the Julian calendar was Julian Day 2,299,308. Making use
+! of the rules for the two calendar systems, 1 March 1600 was Julian
+! Day 2,299,298 + (1600-1583)*365 + 5 (due to leap years) =
+! 2,305,508 under the Gregorian calendar and day 2,305,518 under the
+! Julian calendar.
+! We also set the number of days in 400 years and 100 years.
+! For reference, 400 years is 146097 days under the Gregorian calendar
+! and 146100 days under the Julian calendar. 100 years is 36524 days
+! under the Gregorian calendar and 36525 days under the Julian calendar.
+ if (abs(ioptn) >= 3) then
+!
+! Julian calendar values.
+ yrref = 1600
+ jdref = 2305518
+! = Julian Day reference value for the day that begins
+! at noon on 1 March of the reference year "yrref".
+ ndy400 = 400*365 + 100
+ ndy100 = 100*365 + 25
+!
+! Adjust for Gregorian calendar values.
+ if (ioptn > 0) then
+ jdref = jdref - 10
+ ndy400 = ndy400 - 3
+ ndy100 = ndy100 - 1
+ endif
+ endif
+!
+!----------------------------------------------------------------
+! OPTIONS -1 and +1:
+! Given a calendar date (iday,month,iyear), compute the day number
+! of the year (idayct), where 1 January is day number 1 and 31 December
+! is day number 365 or 366, depending on whether it is a leap year.
+ if (abs(ioptn) == 1) then
+!
+! Compute the day number during the year.
+ if (month <= 2) then
+ idayct = iday + (month-1)*31
+ else
+ idayct = iday + int(30.6001 * (month+1)) - 63 + leap
+ endif
+!
+!----------------------------------------------------------------
+! 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).
+ else if (abs(ioptn) == 2) then
+!
+ if (idayct < 60+leap) then
+ month = (idayct-1)/31
+ iday = idayct - month*31
+ month = month + 1
+ else
+ ndays = idayct - (60+leap)
+! = number of days past 1 March of the current year.
+ jmonth = (10*(ndays+31))/306 + 3
+! = month counter, =4 for March, =5 for April, etc.
+ iday = (ndays+123) - int(30.6001*jmonth)
+ month = jmonth - 1
+ endif
+!
+!----------------------------------------------------------------
+! OPTIONS -3 and +3:
+! Given a calendar date (iday,month,iyear), compute the Julian Day
+! number (idayct) that starts at noon.
+ 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.
+! Define jmonth=4 for March, =5 for April, ..., =15 for February.
+ if (month <= 2) then
+ jyear = jyear - 1
+ jmonth = month + 13
+ else
+ jmonth = month + 1
+ endif
+!
+! 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
+ yr400 = yr400 - 400
+ endif
+!
+ n400yr = (yr400 - yrref)/400
+! = number of 400-year periods from yrref to yr400.
+ nyrs = jyear - yr400
+! = number of years from the beginning of yr400
+! to the beginning of jyear.
+!
+! Compute the Julian Day number.
+ idayct = iday + int(30.6001*jmonth) - 123 + 365*nyrs + nyrs/4 &
+ + jdref + n400yr*ndy400
+!
+! If we are using the Gregorian calendar, we must not count
+! every 100-th year as a leap year. nyrs is less than 400 years,
+! so we do not need to consider the leap year that would occur if
+! nyrs were divisible by 400, i.e., we do not add nyrs/400.
+ if (ioptn > 0) then
+ idayct = idayct - nyrs/100
+ endif
+!
+!----------------------------------------------------------------
+! OPTIONS -5, -4, +4, and +5:
+! Given the Julian Day number (idayct) that starts at noon,
+! compute the corresponding calendar date (iday,month,iyear)
+! (abs(ioptn)=4) or day number during the year (abs(ioptn)=5).
+ else
+!
+! Create a new reference date which begins on the nearest
+! 400-year cycle less than or equal to the Julian Day for 1 March
+! in the year in which the given Julian Day number (idayct) occurs.
+ ndays = idayct - jdref
+ n400yr = ndays / ndy400
+! = integral number of 400-year periods separating
+! idayct and the reference date, jdref.
+ jdref = jdref + n400yr*ndy400
+ if (jdref > idayct) then
+ n400yr = n400yr - 1
+ jdref = jdref - ndy400
+ endif
+!
+ ndays = idayct - jdref
+! = number from the reference date to idayct.
+!
+ n100yr = min(ndays/ndy100, 3)
+! = number of complete 100-year periods
+! from the reference year to the current year.
+! The min() function is necessary to avoid n100yr=4
+! on 29 February of the last year in the 400-year cycle.
+!
+ ndays = ndays - n100yr*ndy100
+! = remainder after removing an integral number of
+! 100-year periods.
+!
+ n4yr = ndays / 1461
+! = number of complete 4-year periods in the current century.
+! 4 years consists of 4*365 + 1 = 1461 days.
+!
+ ndays = ndays - n4yr*1461
+! = remainder after removing an integral number
+! of 4-year periods.
+!
+ n1yr = min(ndays/365, 3)
+! = number of complete years since the last leap year.
+! The min() function is necessary to avoid n1yr=4
+! when the date is 29 February on a leap year,
+! in which case ndays=1460, and 1460/365 = 4.
+!
+ ndays = ndays - 365*n1yr
+! = number of days so far in the current year,
+! where ndays = 0 on 1 March.
+!
+ iyear = n1yr + 4*n4yr + 100*n100yr + 400*n400yr + yrref
+! = year, as counted in the standard way,
+! but relative to 1 March.
+!
+! At this point, we need to separate ioptn=abs(4), which seeks a
+! calendar date, and ioptn=abs(5), which seeks the day number during
+! the year. First compute the calendar date if desired (abs(ioptn)=4).
+ if (abs(ioptn) == 4) then
+ jmonth = (10*(ndays+31))/306 + 3
+! = offset month counter. jmonth=4 for March, =13 for
+! December, =14 for January, =15 for February.
+ iday = (ndays+123) - int(30.6001*jmonth)
+! = day of the month, starting with 1 on the first day
+! of the month.
+!
+! Now adjust for the fact that the year actually begins
+! on 1 January.
+ if (jmonth <= 13) then
+ month = jmonth - 1
+ else
+ month = jmonth - 13
+ iyear = iyear + 1
+ endif
+!
+! This code handles abs(ioptn)=5, finding the day number during the year.
+ else
+! ioptn=5 always returns month = 1, which we set now.
+ month = 1
+!
+! We need to determine whether this is a leap year.
+ leap = 0
+ if ((jyear/4)*4 == jyear) then
+ leap = 1
+ endif
+ if ((ioptn > 0) .and. &
+ ((jyear/100)*100 == jyear) .and. &
+ ((jyear/400)*400 /= jyear) ) then
+ leap = 0
+ endif
+!
+! Now find the day number "iday".
+! ndays is the number of days since the most recent 1 March,
+! so ndays = 0 on 1 March.
+ if (ndays <=305) then
+ iday = ndays + 60 + leap
+ else
+ iday = ndays - 305
+ iyear = iyear + 1
+ endif
+ endif
+!
+! Adjust the year if it is <= 0, and hence BC (Before Christ).
+ if (iyear <= 0) then
+ iyear = iyear - 1
+ endif
+!
+! End the code for the last option, ioptn.
+ endif
+
+ end subroutine calndr
+
diff --git a/src/specfem3D/check_stability.f90 b/src/specfem3D/check_stability.f90
index 1c86dca..30dd262 100644
--- a/src/specfem3D/check_stability.f90
+++ b/src/specfem3D/check_stability.f90
@@ -57,6 +57,20 @@
real(kind=CUSTOM_REAL) b_Usolidnorms, b_Usolidnorms_all
real(kind=CUSTOM_REAL) b_Usolidnormw, b_Usolidnormw_all
+ ! to determine date and time at which the run will finish
+ character(len=8) datein
+ character(len=10) timein
+ character(len=5) :: zone
+ integer, dimension(8) :: time_values
+
+ character(len=3), dimension(12) :: month_name
+ character(len=3), dimension(0:6) :: weekday_name
+ data month_name /'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'/
+ data weekday_name /'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'/
+ integer :: year,mon,day,hr,minutes,timestamp,julian_day_number,day_of_week, &
+ timestamp_remote,year_remote,mon_remote,day_remote,hr_remote,minutes_remote,day_of_week_remote
+ integer, external :: idaywk
+
! initializes
Usolidnorm_all = 0.0_CUSTOM_REAL
Usolidnormp_all = 0.0_CUSTOM_REAL
@@ -212,12 +226,76 @@
ihours_total,iminutes_total,iseconds_total
write(IMAIN,*) 'We have done ',sngl(100.d0*dble(it)/dble(NSTEP)),'% of that'
- if(it < 100) then
- write(IMAIN,*) '************************************************************'
- write(IMAIN,*) '**** BEWARE: the above time estimates are not reliable'
- write(IMAIN,*) '**** because fewer than 100 iterations have been performed'
- write(IMAIN,*) '************************************************************'
+ if (it < NSTEP) then
+
+ ! get current date
+ call date_and_time(datein,timein,zone,time_values)
+ ! time_values(1): year
+ ! time_values(2): month of the year
+ ! time_values(3): day of the month
+ ! time_values(5): hour of the day
+ ! time_values(6): minutes of the hour
+
+ ! compute date at which the run should finish; for simplicity only minutes
+ ! are considered, seconds are ignored; in any case the prediction is not
+ ! accurate down to seconds because of system and network fluctuations
+ year = time_values(1)
+ mon = time_values(2)
+ day = time_values(3)
+ hr = time_values(5)
+ minutes = time_values(6)
+
+ ! get timestamp in minutes of current date and time
+ call convtime(timestamp,year,mon,day,hr,minutes)
+
+ ! add remaining minutes
+ timestamp = timestamp + nint(t_remain / 60.d0)
+
+ ! get date and time of that future timestamp in minutes
+ call invtime(timestamp,year,mon,day,hr,minutes)
+
+ ! convert to Julian day to get day of the week
+ call calndr(day,mon,year,julian_day_number)
+ day_of_week = idaywk(julian_day_number)
+
+ write(IMAIN,"(' The run will finish approximately on (in local time): ',a3,' ',a3,' ',i2.2,', ',i4.4,' ',i2.2,':',i2.2)") &
+ weekday_name(day_of_week),month_name(mon),day,year,hr,minutes
+
+ ! print date and time estimate of end of run in another country.
+ ! For instance: the code runs at Caltech in California but the person
+ ! running the code is connected remotely from France, which has 9 hours more
+ if (ADD_TIME_ESTIMATE_ELSEWHERE .and. HOURS_TIME_DIFFERENCE * 60 + MINUTES_TIME_DIFFERENCE /= 0) then
+
+ ! add time difference with that remote location (can be negative)
+ timestamp_remote = timestamp + HOURS_TIME_DIFFERENCE * 60 + MINUTES_TIME_DIFFERENCE
+
+ ! get date and time of that future timestamp in minutes
+ call invtime(timestamp_remote,year_remote,mon_remote,day_remote,hr_remote,minutes_remote)
+
+ ! convert to Julian day to get day of the week
+ call calndr(day_remote,mon_remote,year_remote,julian_day_number)
+ day_of_week_remote = idaywk(julian_day_number)
+
+ if (HOURS_TIME_DIFFERENCE * 60 + MINUTES_TIME_DIFFERENCE > 0) then
+ write(IMAIN,*) 'Adding positive time difference of ',abs(HOURS_TIME_DIFFERENCE),' hours'
+ else
+ write(IMAIN,*) 'Adding negative time difference of ',abs(HOURS_TIME_DIFFERENCE),' hours'
+ endif
+ write(IMAIN,*) 'and ',abs(MINUTES_TIME_DIFFERENCE),' minutes to get estimate at a remote location'
+ write(IMAIN, &
+ "(' The run will finish approximately on: ',a3,' ',a3,' ',i2.2,', ',i4.4,' ',i2.2,':',i2.2)") &
+ weekday_name(day_of_week_remote),month_name(mon_remote),day_remote,year_remote,hr_remote,minutes_remote
+ endif
+
+ if (it < 100) then
+ write(IMAIN,*) '************************************************************'
+ write(IMAIN,*) '**** BEWARE: the above time estimates are not reliable'
+ write(IMAIN,*) '**** because fewer than 100 iterations have been performed'
+ write(IMAIN,*) '************************************************************'
+ endif
+
endif
+
write(IMAIN,*)
! flushes file buffer for main output file (IMAIN)
@@ -265,6 +343,38 @@
write(IOUT,"(' Estimated total run time in hh:mm:ss = ',i6,' h ',i2.2,' m ',i2.2,' s')") &
ihours_total,iminutes_total,iseconds_total
write(IOUT,*) 'We have done ',sngl(100.d0*dble(it)/dble(NSTEP)),'% of that'
+
+ if (it < NSTEP) then
+
+ write(IOUT,"(' The run will finish approximately on (in local time): ',a3,' ',a3,' ',i2.2,', ',i4.4,' ',i2.2,':',i2.2)") &
+ weekday_name(day_of_week),month_name(mon),day,year,hr,minutes
+
+ ! print date and time estimate of end of run in another country.
+ ! For instance: the code runs at Caltech in California but the person
+ ! running the code is connected remotely from France, which has 9 hours more
+ if (ADD_TIME_ESTIMATE_ELSEWHERE .and. HOURS_TIME_DIFFERENCE * 60 + MINUTES_TIME_DIFFERENCE /= 0) then
+ if (HOURS_TIME_DIFFERENCE * 60 + MINUTES_TIME_DIFFERENCE > 0) then
+ write(IOUT,*) 'Adding positive time difference of ',abs(HOURS_TIME_DIFFERENCE),' hours'
+ else
+ write(IOUT,*) 'Adding negative time difference of ',abs(HOURS_TIME_DIFFERENCE),' hours'
+ endif
+ write(IOUT,*) 'and ',abs(MINUTES_TIME_DIFFERENCE),' minutes to get estimate at a remote location'
+ write(IOUT, &
+ "(' The run will finish approximately on (in remote time): ',a3,' ',a3,' ',i2.2,', ',i4.4,' ',i2.2,':',i2.2)") &
+ weekday_name(day_of_week_remote),month_name(mon_remote), &
+ day_remote,year_remote,hr_remote,minutes_remote
+ endif
+
+ if (it < 100) then
+ write(IOUT,*)
+ write(IOUT,*) '************************************************************'
+ write(IOUT,*) '**** BEWARE: the above time estimates are not reliable'
+ write(IOUT,*) '**** because fewer than 100 iterations have been performed'
+ write(IOUT,*) '************************************************************'
+ endif
+
+ endif
+
close(IOUT)
! check stability of the code, exit if unstable
diff --git a/src/specfem3D/convert_time.f90 b/src/specfem3D/convert_time.f90
new file mode 100644
index 0000000..f6ecd69
--- /dev/null
+++ b/src/specfem3D/convert_time.f90
@@ -0,0 +1,269 @@
+!=====================================================================
+!
+! S p e c f e m 3 D V e r s i o n 2 . 1
+! ---------------------------------------
+!
+! Main historical authors: Dimitri Komatitsch and Jeroen Tromp
+! Princeton University, USA
+! and CNRS / University of Marseille, France
+! (there are currently many more authors!)
+! (c) Princeton University and CNRS / University of Marseille, July 2012
+!
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License along
+! with this program; if not, write to the Free Software Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+!=====================================================================
+
+! open-source subroutines taken from the World Ocean Circulation Experiment (WOCE)
+! web site at http://www.coaps.fsu.edu/woce/html/wcdtools.htm
+
+! converted to Fortran90 by Dimitri Komatitsch, University of Pau, France, January 2008.
+! Also converted "convtime" from a function to a subroutine.
+! Also used a more complete test to detect leap years (the original version was incomplete).
+
+! extended by Dimitri Komatitsch, University of Toulouse, France, April 2011,
+! to go beyond the year 2020; I extended that to the year 3000 and thus had to write a loop to fill array "year()".
+
+ subroutine convtime(timestamp,yr,mon,day,hr,minvalue)
+
+! Originally written by Shawn Smith (ssmith AT coaps.fsu.edu)
+! Updated Spring 1999 for Y2K compliance by Anthony Arguez (anthony AT coaps.fsu.edu).
+
+! This subroutine will convert a given year, month, day, hour, and
+! minutes to a minutes from 01 Jan 1980 00:00 time stamp.
+
+ implicit none
+
+ integer, parameter :: MAX_YEAR = 3000
+
+ integer, intent(out) :: timestamp
+
+ integer, intent(in) :: yr,mon,day,hr,minvalue
+
+ integer :: year(1980:MAX_YEAR),month(12),leap_mon(12)
+
+ integer :: min_day,min_hr,iyr
+
+! function to determine if year is a leap year
+ logical, external :: is_leap_year
+
+ data month /0, 44640, 84960, 129600, 172800, 217440, 260640, &
+ 305280, 349920, 393120, 437760, 480960/
+
+ data leap_mon /0, 44640, 86400, 131040, 174240, 218880, 262080, &
+ 306720, 351360, 394560, 439200, 482400/
+
+ data min_day, min_hr /1440, 60/
+
+! loop added by Dimitri Komatitsch to fill array "year()" automatically
+ year(:) = 0
+ do iyr = 1981,MAX_YEAR
+ if (is_leap_year(iyr-1)) then
+ year(iyr) = year(iyr-1) + 366*24*60 ! number of minutes in a year if leap year
+ else
+ year(iyr) = year(iyr-1) + 365*24*60 ! number of minutes in a year if not leap year
+ endif
+ enddo
+
+! Test values to see if they fit valid ranges
+ if (yr < 1980) stop 'Error in convtime: year out of range, must be >= 1980'
+
+ if (mon < 1 .or. mon > 12) stop 'Error in convtime: month out of range (1-12)'
+
+ 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)'
+ 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
+ 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)'
+ endif
+
+ if (hr < 0 .or. hr > 23) stop 'Error in convtime: hour out of range (0-23)'
+
+ if (minvalue < 0 .or. minvalue > 60) stop 'Error in convtime: minute out of range (0-60)'
+
+! convert time (test if leap year)
+ if (is_leap_year(yr)) then
+ timestamp = year(yr)+leap_mon(mon)+((day-1)*min_day)+(hr*min_hr)+minvalue
+ else
+ timestamp = year(yr)+month(mon)+((day-1)*min_day)+(hr*min_hr)+minvalue
+ endif
+
+ end subroutine convtime
+
+!
+!----
+!
+
+ subroutine invtime(timestamp,yr,mon,day,hr,minvalue)
+
+! This subroutine will convert a minutes timestamp to a year/month
+! date. Based on the function convtime by Shawn Smith (COAPS).
+!
+! Written the spring of 1995, several iterations.
+! James N. Stricherz (stricherz AT coaps.fsu.edu)
+!
+! Updated for Y2K compliance in July 1999.
+! Shyam Lakshmin (lakshmin AT coaps.fsu.edu)
+!
+! This code returns correct results for the range of 01 Jan 1980 00:00
+! through 31 Dec 2020 23:59. I know it does, because I tried each minute of that range.
+
+ implicit none
+
+ integer, parameter :: MAX_YEAR = 3000
+
+ integer, intent(in) :: timestamp
+
+ integer, intent(out) :: yr,mon,day,hr,minvalue
+
+ integer :: year(1980:MAX_YEAR),month(13),leap_mon(13)
+
+ integer :: min_day,min_hr,itime,tmon,ttime,thour,iyr,imon,iday,ihour
+
+! function to determine if year is a leap year
+ logical, external :: is_leap_year
+
+ data month /0, 44640, 84960, 129600, 172800, 217440, 260640, &
+ 305280, 349920, 393120, 437760, 480960, 525600/
+
+ data leap_mon /0, 44640, 86400, 131040, 174240, 218880, 262080, &
+ 306720, 351360, 394560, 439200, 482400, 527040/
+
+ data min_day, min_hr /1440, 60/
+
+! loop added by Dimitri Komatitsch to fill array "year()" automatically
+ year(:) = 0
+ do iyr = 1981,MAX_YEAR
+ if (is_leap_year(iyr-1)) then
+ year(iyr) = year(iyr-1) + 366*24*60 ! number of minutes in a year if leap year
+ else
+ year(iyr) = year(iyr-1) + 365*24*60 ! number of minutes in a year if not leap year
+ endif
+ enddo
+
+! OK, let us invert the effects of the years: subtract off the
+! number of minutes per year until it goes negative
+! iyr then gives the year that the time (in minutes) occurs
+ if (timestamp >= year(MAX_YEAR)) stop 'year too high in invtime'
+
+ iyr = 1979
+ itime=timestamp
+
+ 10 iyr=iyr+1
+ ttime=itime-year(iyr)
+ if (ttime <= 0) then
+ if (iyr == 1980) iyr=iyr+1
+ iyr=iyr-1
+ itime=itime-year(iyr)
+ else
+ goto 10
+ endif
+
+! assign the return variable
+ yr=iyr
+
+! OK, the remaining time is less than one full year, so convert
+! by the same method as above into months
+ imon = 0
+
+! if not leap year
+ if (.not. is_leap_year(iyr)) then
+
+! increment the month, and subtract off the minutes from the
+! remaining time for a non-leap year
+ 20 imon=imon+1
+ tmon=itime-month(imon)
+ if (tmon > 0) then
+ goto 20
+ else if (tmon < 0) then
+ imon=imon-1
+ itime=itime-month(imon)
+ else
+ if (imon > 12) then
+ imon=imon-12
+ yr=yr+1
+ endif
+ mon=imon
+ day = 1
+ hr = 0
+ minvalue = 0
+ return
+ endif
+
+! if leap year
+ else
+
+! same thing, same code, but for a leap year
+ 30 imon=imon+1
+ tmon=itime-leap_mon(imon)
+ if (tmon > 0) then
+ goto 30
+ else if (tmon < 0) then
+ imon=imon-1
+ itime=itime-month(imon)
+ else
+ if (imon > 12) then
+ imon=imon-12
+ yr=yr+1
+ endif
+ mon=imon
+ day = 1
+ hr = 0
+ minvalue = 0
+ return
+ endif
+ endif
+
+! assign the return variable
+ mon=imon
+
+! any remaining minutes will belong to day/hour/minutes
+! OK, let us get the days
+ iday = 0
+ 40 iday=iday+1
+ ttime=itime-min_day
+ if (ttime >= 0) then
+ itime=ttime
+ goto 40
+ endif
+
+! assign the return variable
+ if (is_leap_year(iyr) .and. mon > 2) then
+ day=iday-1
+ else
+ day=iday
+ endif
+
+! pick off the hours of the days...remember, hours can be 0, so we start at -1
+ ihour=-1
+ 50 ihour=ihour+1
+ thour=itime-min_hr
+ if (thour >= 0) then
+ itime=thour
+ goto 50
+ endif
+
+! assign the return variables
+ hr=ihour
+
+! the remainder at this point is the minutes, so return them directly
+ minvalue=itime
+
+ end subroutine invtime
+
diff --git a/src/specfem3D/initialize_simulation.f90 b/src/specfem3D/initialize_simulation.f90
index b0746cc..a328e77 100644
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@ -58,8 +58,8 @@
ADIOS_FOR_MESH, ADIOS_FOR_FORWARD_ARRAYS, &
ADIOS_FOR_KERNELS)
-!! DK DK added this for now (March 2013) because CPML is not yet implemented for fluid-solid coupling;
-!! DK DK we will soon add it (in a month or so)
+!! DK DK added this for now (March 2013)
+!! DK DK we will soon add it
if(PML_CONDITIONS .and. (SAVE_FORWARD .or. SIMULATION_TYPE==3)) stop 'PML_CONDITIONS is still under test for adjoint simulation'
! GPU_MODE is in par_file
diff --git a/src/specfem3D/read_mesh_databases.F90 b/src/specfem3D/read_mesh_databases.F90
index f75870b..328d86d 100644
--- a/src/specfem3D/read_mesh_databases.F90
+++ b/src/specfem3D/read_mesh_databases.F90
@@ -640,13 +640,6 @@
call flush_IMAIN()
endif
- ! debug
- !call sum_all_i(num_interfaces_ext_mesh,inum)
- !if(myrank == 0) then
- ! write(IMAIN,*) 'number of MPI partition interfaces: ',inum
- ! write(IMAIN,*)
- !endif
-
! MPI communications
if( ACOUSTIC_SIMULATION ) then
allocate(buffer_send_scalar_ext_mesh(max_nibool_interfaces_ext_mesh,num_interfaces_ext_mesh), &
@@ -730,7 +723,6 @@
end subroutine read_mesh_databases
-
!
!-------------------------------------------------------------------------------------------------
!
@@ -1127,3 +1119,4 @@
endif
end subroutine read_mesh_databases_adjoint
+
diff --git a/src/specfem3D/rules.mk b/src/specfem3D/rules.mk
index 1ffa36e..477a706 100644
--- a/src/specfem3D/rules.mk
+++ b/src/specfem3D/rules.mk
@@ -79,6 +79,8 @@ specfem3D_OBJECTS = \
$O/compute_stacey_viscoelastic.spec.o \
$O/compute_stacey_poroelastic.spec.o \
$O/compute_total_energy.spec.o \
+ $O/convert_time.spec.o \
+ $O/calendar.spec.o \
$O/create_color_image.spec.o \
$O/detect_mesh_surfaces.spec.o \
$O/finalize_simulation.spec.o \
@@ -354,6 +356,8 @@ $O/compute_forces_acoustic_calling_routine.spec.o: $O/specfem3D_par.spec.o $O/pm
$O/compute_forces_acoustic_Dev.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
$O/compute_forces_acoustic_noDev.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
$O/compute_total_energy.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
+$O/convert_time.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
+$O/calendar.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
$O/pml_allocate_arrays.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
$O/pml_compute_accel_contribution.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
$O/pml_compute_memory_variables.spec.o: $O/specfem3D_par.spec.o $O/pml_par.spec.o
More information about the CIG-COMMITS
mailing list