[cig-commits] r12595 - in seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta: DATA OUTPUT_FILES setup src
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Fri Aug 8 12:31:32 PDT 2008
Author: dkomati1
Date: 2008-08-08 12:31:31 -0700 (Fri, 08 Aug 2008)
New Revision: 12595
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_1second_Ranger_elastic
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_5seconds_Earth_Simulator_elastic
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_ori_v2
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/setup/constants.h
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90
Log:
fixed a small bug in main_program.f90: writing to file IMAIN = 42, which was closed
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file 2008-08-08 19:31:31 UTC (rev 12595)
@@ -4,7 +4,7 @@
SAVE_FORWARD = .false. # save last frame of forward simulation or not
# number of chunks (1,2,3 or 6)
-NCHUNKS = 6
+NCHUNKS = 1
# angular width of the first chunk (not used if full sphere with six chunks)
ANGULAR_WIDTH_XI_IN_DEGREES = 90.d0 # angular size of a chunk
@@ -14,7 +14,7 @@
GAMMA_ROTATION_AZIMUTH = 0.d0
# number of elements at the surface along the two sides of the first chunk
-# (must be multiple of 16 and 8 * multiple of NPROC below)
+# (must be multiple of 16 and also of 8 * multiple of NPROC below)
NEX_XI = 64 # 144 288 432 576 720 864 1008 1152 1296 1440
NEX_ETA = 64
@@ -31,7 +31,7 @@
# fully 3D models:
# transversely_isotropic_prem_plus_3D_crust_2.0, 3D_anisotropic, 3D_attenuation,
# s20rts, s362ani, s362iso, s362wmani, s362ani_prem, s29ea, s29ea,sea99_jp3d1994,sea99,jp3d1994
-MODEL = 1D_isotropic_prem
+MODEL = 1D_transversely_isotropic_prem_onecrust
# parameters describing the Earth model
OCEANS = .false.
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_1second_Ranger_elastic
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_1second_Ranger_elastic 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_1second_Ranger_elastic 2008-08-08 19:31:31 UTC (rev 12595)
@@ -14,7 +14,7 @@
GAMMA_ROTATION_AZIMUTH = 0.d0
# number of elements at the surface along the two sides of the first chunk
-# (must be multiple of 16 and 8 * multiple of NPROC below)
+# (must be multiple of 16 and also of 8 * multiple of NPROC below)
NEX_XI = 4080 # 816 1632 2448 3264 4080 4896 5712 6528
NEX_ETA = 4080
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_5seconds_Earth_Simulator_elastic
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_5seconds_Earth_Simulator_elastic 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_5seconds_Earth_Simulator_elastic 2008-08-08 19:31:31 UTC (rev 12595)
@@ -14,7 +14,7 @@
GAMMA_ROTATION_AZIMUTH = 0.d0
# number of elements at the surface along the two sides of the first chunk
-# (must be multiple of 16 and 8 * multiple of NPROC below)
+# (must be multiple of 16 and also of 8 * multiple of NPROC below)
NEX_XI = 864 # 144 288 432 576 720 864 1008 1152 1296 1440
NEX_ETA = 864
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_ori_v2
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_ori_v2 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/DATA/Par_file_ori_v2 2008-08-08 19:31:31 UTC (rev 12595)
@@ -14,7 +14,7 @@
GAMMA_ROTATION_AZIMUTH = 20.d0
# number of elements at the surface along the two sides of the first chunk
-# (must be multiple of 16 and 8 * multiple of NPROC below)
+# (must be multiple of 16 and also of 8 * multiple of NPROC below)
NEX_XI = 64 # 96
NEX_ETA = 64 # 96
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h 2008-08-08 19:31:31 UTC (rev 12595)
@@ -6,29 +6,29 @@
! ---------------
!
!
- ! number of chunks = 3
+ ! number of chunks = 1
!
! these statistics do not include the central cube
!
- ! number of processors = 12
+ ! number of processors = 4
!
- ! maximum number of points per region = 576013
+ ! maximum number of points per region = 509449
!
! on NEC SX, make sure "loopcnt=" parameter
- ! in Makefile is greater than max vector length = 1728039
+ ! in Makefile is greater than max vector length = 1528347
!
- ! total elements per slice = 9360
- ! total points per slice = 626599
+ ! total elements per slice = 8336
+ ! total points per slice = 560035
!
! total for full 6-chunk mesh:
! ---------------------------
!
! exact total number of spectral elements in entire mesh =
- ! 224640.000000000
+ ! 200064.000000000
! approximate total number of points in entire mesh =
- ! 15038376.0000000
+ ! 13440840.0000000
! approximate total number of degrees of freedom in entire mesh =
- ! 42811848.0000000
+ ! 38019240.0000000
!
! position of the mesh chunk at the surface:
! -----------------------------------------
@@ -66,8 +66,8 @@
! average distance between points in km = 39.09196
! average size of a spectral element in km = 156.3679
!
- ! number of time steps = 7900
- ! value of a time step DT = 0.190000000000000
+ ! number of time steps = 6300
+ ! value of a time step DT = 0.239400000000000
!
! number of seismic sources = 1
!
@@ -75,7 +75,7 @@
! approximate static memory needed by the solver:
! ----------------------------------------------
!
- ! size of static arrays per slice = 8.134651184082031E-002 GB
+ ! size of static arrays per slice = 7.561429217457771E-002 GB
!
! (should be below and typically equal to 80% of 1.5 GB = 1.2 GB on pangu
! at Caltech, and below and typically equal to 85% of 2 GB = 1.7 GB
@@ -83,25 +83,25 @@
! (if significantly more, the job will not run by lack of memory)
! (if significantly less, you waste a significant amount of memory)
!
- ! size of static arrays for all slices = 0.976158142089844 GB
- ! = 9.532794356346130E-004 TB
+ ! size of static arrays for all slices = 0.302457168698311 GB
+ ! = 2.953683288069442E-004 TB
!
integer, parameter :: NEX_XI_VAL = 64
integer, parameter :: NEX_ETA_VAL = 64
- integer, parameter :: NSPEC_CRUST_MANTLE = 8640
+ integer, parameter :: NSPEC_CRUST_MANTLE = 7616
integer, parameter :: NSPEC_OUTER_CORE = 688
integer, parameter :: NSPEC_INNER_CORE = 32
- integer, parameter :: NGLOB_CRUST_MANTLE = 576013
+ integer, parameter :: NGLOB_CRUST_MANTLE = 509449
integer, parameter :: NGLOB_OUTER_CORE = 47985
integer, parameter :: NGLOB_INNER_CORE = 2601
integer, parameter :: NSPECMAX_ANISO_IC = 1
- integer, parameter :: NSPECMAX_ISO_MANTLE = 8640
- integer, parameter :: NSPECMAX_TISO_MANTLE = 1
+ integer, parameter :: NSPECMAX_ISO_MANTLE = 7616
+ integer, parameter :: NSPECMAX_TISO_MANTLE = 2304
integer, parameter :: NSPECMAX_ANISO_MANTLE = 1
integer, parameter :: NSPEC_CRUST_MANTLE_ATTENUAT = 1
@@ -129,7 +129,7 @@
integer, parameter :: NGLOB_CRUST_MANTLE_OCEANS = 1
- logical, parameter :: TRANSVERSE_ISOTROPY_VAL = .false.
+ logical, parameter :: TRANSVERSE_ISOTROPY_VAL = .true.
logical, parameter :: ANISOTROPIC_3D_MANTLE_VAL = .false.
@@ -146,31 +146,31 @@
logical, parameter :: ROTATION_VAL = .false.
integer, parameter :: NSPEC_OUTER_CORE_ROTATION = 1
- integer, parameter :: NGLOB1D_RADIAL_CM = 109
+ integer, parameter :: NGLOB1D_RADIAL_CM = 105
integer, parameter :: NGLOB1D_RADIAL_OC = 65
integer, parameter :: NGLOB1D_RADIAL_IC = 9
- integer, parameter :: NGLOB2DMAX_XMIN_XMAX_CM = 8574
+ integer, parameter :: NGLOB2DMAX_XMIN_XMAX_CM = 7934
integer, parameter :: NGLOB2DMAX_XMIN_XMAX_OC = 2134
integer, parameter :: NGLOB2DMAX_XMIN_XMAX_IC = 178
- integer, parameter :: NGLOB2DMAX_YMIN_YMAX_CM = 8574
+ integer, parameter :: NGLOB2DMAX_YMIN_YMAX_CM = 7934
integer, parameter :: NGLOB2DMAX_YMIN_YMAX_OC = 2134
integer, parameter :: NGLOB2DMAX_YMIN_YMAX_IC = 178
integer, parameter :: NPROC_XI_VAL = 2
integer, parameter :: NPROC_ETA_VAL = 2
- integer, parameter :: NCHUNKS_VAL = 3
- integer, parameter :: NPROCTOT_VAL = 12
- integer, parameter :: NGLOB2DMAX_XY_VAL_CM = 8574
+ integer, parameter :: NCHUNKS_VAL = 1
+ integer, parameter :: NPROCTOT_VAL = 4
+ integer, parameter :: NGLOB2DMAX_XY_VAL_CM = 7934
integer, parameter :: NGLOB2DMAX_XY_VAL_OC = 2134
integer, parameter :: NGLOB2DMAX_XY_VAL_IC = 178
- integer, parameter :: NUMMSGS_FACES_VAL = 6
+ integer, parameter :: NUMMSGS_FACES_VAL = 2
integer, parameter :: NCORNERSCHUNKS_VAL = 1
integer, parameter :: ATT1 = 1
integer, parameter :: ATT2 = 1
integer, parameter :: ATT3 = 1
integer, parameter :: ATT4 = 1
integer, parameter :: ATT5 = 1
- integer, parameter :: NSPEC2DMAX_XMIN_XMAX_CM = 440
- integer, parameter :: NSPEC2DMAX_YMIN_YMAX_CM = 440
+ integer, parameter :: NSPEC2DMAX_XMIN_XMAX_CM = 408
+ integer, parameter :: NSPEC2DMAX_YMIN_YMAX_CM = 408
integer, parameter :: NSPEC2D_BOTTOM_CM = 64
integer, parameter :: NSPEC2D_TOP_CM = 1024
integer, parameter :: NSPEC2DMAX_XMIN_XMAX_IC = 8
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/setup/constants.h
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/setup/constants.h 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/setup/constants.h 2008-08-08 19:31:31 UTC (rev 12595)
@@ -56,9 +56,9 @@
! local file unit for output of buffers
integer, parameter :: IOUT_BUFFERS = 35
! uncomment this to write messages to a text file
- integer, parameter :: IMAIN = 42
+! integer, parameter :: IMAIN = 42
! uncomment this to write messages to the screen (slows down the code)
-! integer, parameter :: IMAIN = ISTANDARD_OUTPUT
+ integer, parameter :: IMAIN = ISTANDARD_OUTPUT
! R_EARTH is the radius of the bottom of the oceans (radius of Earth in m)
double precision, parameter :: R_EARTH = 6371000.d0
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.f90 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.f90 2008-08-08 19:31:31 UTC (rev 12595)
@@ -313,14 +313,6 @@
! broadcast the information read on the master to the nodes
call MPI_BCAST(nrec,1,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
- if(myrank == 0) then
- write(IMAIN,*)
- write(IMAIN,*) 'Total number of receivers = ', nrec
- write(IMAIN,*)
- endif
-
- if(nrec < 1) call exit_MPI(myrank,'need at least one receiver')
-
!! DK DK for the merged version
!!!!!!!! DK DK solver inserted here
!!!!!!!! DK DK solver inserted here
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90 2008-08-08 16:22:52 UTC (rev 12594)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90 2008-08-08 19:31:31 UTC (rev 12595)
@@ -924,18 +924,23 @@
endif
! check that the number of points in this slice is correct
-
- if(minval(ibool_crust_mantle(:,:,:,:)) /= 1 .or. &
- maxval(ibool_crust_mantle(:,:,:,:)) /= NGLOB_CRUST_MANTLE) &
+ if(minval(ibool_crust_mantle) /= 1 .or. maxval(ibool_crust_mantle) /= NGLOB_CRUST_MANTLE) &
call exit_MPI(myrank,'incorrect global numbering: iboolmax does not equal nglob in crust and mantle')
- if(minval(ibool_outer_core(:,:,:,:)) /= 1 .or. &
- maxval(ibool_outer_core(:,:,:,:)) /= NGLOB_OUTER_CORE) &
+ if(minval(ibool_outer_core) /= 1 .or. maxval(ibool_outer_core) /= NGLOB_OUTER_CORE) &
call exit_MPI(myrank,'incorrect global numbering: iboolmax does not equal nglob in outer core')
- if(minval(ibool_inner_core(:,:,:,:)) /= 1 .or. maxval(ibool_inner_core(:,:,:,:)) /= NGLOB_INNER_CORE) &
+ if(minval(ibool_inner_core) /= 1 .or. maxval(ibool_inner_core) /= NGLOB_INNER_CORE) &
call exit_MPI(myrank,'incorrect global numbering: iboolmax does not equal nglob in inner core')
+! check that there is at least one receiver
+ if(myrank == 0) then
+ write(IMAIN,*)
+ write(IMAIN,*) 'Total number of receivers = ', nrec
+ write(IMAIN,*)
+ endif
+ if(nrec < 1) call exit_MPI(myrank,'need at least one receiver')
+
! $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
! locate sources in the mesh
More information about the cig-commits
mailing list