[cig-commits] r14004 - in seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta: OUTPUT_FILES src
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sun Feb 1 16:36:41 PST 2009
Author: dkomati1
Date: 2009-02-01 16:36:41 -0800 (Sun, 01 Feb 2009)
New Revision: 14004
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90
Log:
modified some declarations to suppress warnings when compiling in serial mode
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 2009-02-02 00:17:12 UTC (rev 14003)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h 2009-02-02 00:36:41 UTC (rev 14004)
@@ -8,7 +8,7 @@
!
! number of chunks = 6
!
- ! these statistics include the central cube
+ ! these statistics do not include the central cube
!
! number of processors = 96
!
@@ -17,18 +17,18 @@
! on NEC SX, make sure "loopcnt=" parameter
! in Makefile is greater than max vector length = 1528347
!
- ! total elements per slice = 8592
- ! total points per slice = 578531
+ ! 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 =
- ! 804352.000000000
+ ! 800256.000000000
! approximate total number of points in entire mesh =
- ! 54165851.0000000
+ ! 53763360.0000000
! approximate total number of degrees of freedom in entire mesh =
- ! 153284433.000000
+ ! 152076960.000000
!
! resolution of the mesh at the surface:
! -------------------------------------
@@ -48,7 +48,7 @@
! approximate static memory needed by the solver:
! ----------------------------------------------
!
- ! size of static arrays per slice = 0.155213307589293 GB
+ ! size of static arrays per slice = 0.150383662432432 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
@@ -56,8 +56,8 @@
! (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 = 14.9004775285721 GB
- ! = 1.455124758649617E-002 TB
+ ! size of static arrays for all slices = 14.4368315935135 GB
+ ! = 1.409846835304052E-002 TB
!
integer, parameter :: NEX_XI_VAL = 128
@@ -65,11 +65,11 @@
integer, parameter :: NSPEC_CRUST_MANTLE = 7616
integer, parameter :: NSPEC_OUTER_CORE = 688
- integer, parameter :: NSPEC_INNER_CORE = 288
+ integer, parameter :: NSPEC_INNER_CORE = 32
integer, parameter :: NGLOB_CRUST_MANTLE = 509449
integer, parameter :: NGLOB_OUTER_CORE = 47985
- integer, parameter :: NGLOB_INNER_CORE = 21097
+ integer, parameter :: NGLOB_INNER_CORE = 2601
integer, parameter :: NSPECMAX_ANISO_IC = 1
@@ -79,10 +79,10 @@
integer, parameter :: NSPEC_CRUST_MANTLE_ATTENUAT = 7616
integer, parameter :: NSPEC_CRUST_MANTLE_ATTENUAT3D = 1
- integer, parameter :: NSPEC_INNER_CORE_ATTENUATION = 288
+ integer, parameter :: NSPEC_INNER_CORE_ATTENUATION = 32
integer, parameter :: NSPEC_CRUST_MANTLE_STR_OR_ATT = 7616
- integer, parameter :: NSPEC_INNER_CORE_STR_OR_ATT = 288
+ integer, parameter :: NSPEC_INNER_CORE_STR_OR_ATT = 32
integer, parameter :: NSPEC_CRUST_MANTLE_STR_AND_ATT = 1
integer, parameter :: NSPEC_INNER_CORE_STR_AND_ATT = 1
@@ -125,17 +125,17 @@
integer, parameter :: NGLOB1D_RADIAL_IC = 9
integer, parameter :: NGLOB2DMAX_XMIN_XMAX_CM = 7934
integer, parameter :: NGLOB2DMAX_XMIN_XMAX_OC = 2134
- integer, parameter :: NGLOB2DMAX_XMIN_XMAX_IC = 1283
+ integer, parameter :: NGLOB2DMAX_XMIN_XMAX_IC = 178
integer, parameter :: NGLOB2DMAX_YMIN_YMAX_CM = 7934
integer, parameter :: NGLOB2DMAX_YMIN_YMAX_OC = 2134
- integer, parameter :: NGLOB2DMAX_YMIN_YMAX_IC = 1283
+ integer, parameter :: NGLOB2DMAX_YMIN_YMAX_IC = 178
integer, parameter :: NPROC_XI_VAL = 4
integer, parameter :: NPROC_ETA_VAL = 4
integer, parameter :: NCHUNKS_VAL = 6
integer, parameter :: NPROCTOT_VAL = 96
integer, parameter :: NGLOB2DMAX_XY_VAL_CM = 7934
integer, parameter :: NGLOB2DMAX_XY_VAL_OC = 2134
- integer, parameter :: NGLOB2DMAX_XY_VAL_IC = 1283
+ integer, parameter :: NGLOB2DMAX_XY_VAL_IC = 178
integer, parameter :: NUMMSGS_FACES_VAL = 48
integer, parameter :: NCORNERSCHUNKS_VAL = 8
integer, parameter :: ATT1 = 1
@@ -147,8 +147,8 @@
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 = 72
- integer, parameter :: NSPEC2DMAX_YMIN_YMAX_IC = 72
+ integer, parameter :: NSPEC2DMAX_XMIN_XMAX_IC = 8
+ integer, parameter :: NSPEC2DMAX_YMIN_YMAX_IC = 8
integer, parameter :: NSPEC2D_BOTTOM_IC = 16
integer, parameter :: NSPEC2D_TOP_IC = 16
integer, parameter :: NSPEC2DMAX_XMIN_XMAX_OC = 100
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.F90 2009-02-02 00:17:12 UTC (rev 14003)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/main_program.F90 2009-02-02 00:36:41 UTC (rev 14004)
@@ -254,6 +254,8 @@
integer npoin2D_faces_crust_mantle(NUMFACES_SHARED)
integer npoin2D_faces_outer_core(NUMFACES_SHARED)
integer npoin2D_faces_inner_core(NUMFACES_SHARED)
+
+ integer, dimension(NB_SQUARE_EDGES_ONEDIR) :: npoin2D_xi_outer_core,npoin2D_eta_outer_core
#endif
! for non blocking communications
@@ -262,7 +264,6 @@
logical, dimension(NSPEC_INNER_CORE) :: is_on_a_slice_edge_inner_core
integer, dimension(NB_SQUARE_EDGES_ONEDIR) :: npoin2D_xi_crust_mantle,npoin2D_eta_crust_mantle, &
- npoin2D_xi_outer_core,npoin2D_eta_outer_core, &
npoin2D_xi_inner_core,npoin2D_eta_inner_core
real(kind=CUSTOM_REAL), dimension(NGLOB_CRUST_MANTLE_OCEANS) :: rmass_ocean_load
@@ -554,9 +555,9 @@
npoin2D_faces_crust_mantle,npoin2D_xi_crust_mantle,npoin2D_eta_crust_mantle, &
npoin2D_faces_outer_core,npoin2D_xi_outer_core,npoin2D_eta_outer_core, &
npoin2D_faces_inner_core,npoin2D_xi_inner_core,npoin2D_eta_inner_core, &
- normal_top_crust_mantle,ibelm_top_crust_mantle, &
+ normal_top_crust_mantle, &
#endif
- AM_V,xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,&
+ ibelm_top_crust_mantle,AM_V,xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,&
etax_crust_mantle,etay_crust_mantle,etaz_crust_mantle, &
gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle,displ_crust_mantle, &
bcast_integer,bcast_double_precision,bcast_logical,MODEL,ner,ratio_sampling_array,doubling_index, &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90 2009-02-02 00:17:12 UTC (rev 14003)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.F90 2009-02-02 00:36:41 UTC (rev 14004)
@@ -51,9 +51,9 @@
npoin2D_faces_crust_mantle,npoin2D_xi_crust_mantle,npoin2D_eta_crust_mantle, &
npoin2D_faces_outer_core,npoin2D_xi_outer_core,npoin2D_eta_outer_core, &
npoin2D_faces_inner_core,npoin2D_xi_inner_core,npoin2D_eta_inner_core, &
- normal_top_crust_mantle,ibelm_top_crust_mantle, &
+ normal_top_crust_mantle, &
#endif
- AM_V,xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,&
+ ibelm_top_crust_mantle,AM_V,xix_crust_mantle,xiy_crust_mantle,xiz_crust_mantle,&
etax_crust_mantle,etay_crust_mantle,etaz_crust_mantle, &
gammax_crust_mantle,gammay_crust_mantle,gammaz_crust_mantle,displ_crust_mantle, &
bcast_integer,bcast_double_precision,bcast_logical,MODEL,ner,ratio_sampling_array,doubling_index, &
@@ -161,7 +161,6 @@
! additional mass matrix for ocean load
real(kind=CUSTOM_REAL), dimension(NDIM,NGLLX,NGLLY,NSPEC2D_TOP_CM) :: normal_top_crust_mantle
- integer, dimension(NSPEC2D_TOP_CM) :: ibelm_top_crust_mantle
! flag to mask ocean-bottom degrees of freedom for ocean load
logical, dimension(NGLOB_CRUST_MANTLE_OCEANS) :: updated_dof_ocean_load
@@ -169,6 +168,8 @@
real(kind=CUSTOM_REAL) additional_term,force_normal_comp
#endif
+ integer, dimension(NSPEC2D_TOP_CM) :: ibelm_top_crust_mantle
+
! variable lengths for factor_common and one_minus_sum_beta
integer :: vx_crust_mantle,vy_crust_mantle,vz_crust_mantle,vnspec_crust_mantle
integer :: vx_inner_core,vy_inner_core,vz_inner_core,vnspec_inner_core
@@ -203,9 +204,10 @@
! ---- arrays to assemble between chunks
+ integer :: ipoin
+
#ifdef USE_MPI
- integer :: ipoin
integer :: iphase_CC
! communication pattern for faces between chunks
@@ -2911,7 +2913,9 @@
call system(system_command)
endif
! synchronize all the processes to make sure everybody has finished
+#ifdef USE_MPI
call MPI_BARRIER(MPI_COMM_WORLD,ier)
+#endif
write(outputname,"('/dump_all_arrays',i6.6)") myrank
open(unit=55,file=trim(PATH_RESTART_FILES)//outputname,status='unknown',form='unformatted',action='write')
More information about the CIG-COMMITS
mailing list