[cig-commits] r12551 - in seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta: OUTPUT_FILES src
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Wed Aug 6 13:17:11 PDT 2008
Author: dkomati1
Date: 2008-08-06 13:17:10 -0700 (Wed, 06 Aug 2008)
New Revision: 12551
Modified:
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90
Log:
converted allocate_after_2.f90 from heap to stack
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-06 19:52:48 UTC (rev 12550)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/OUTPUT_FILES/values_from_mesher.h 2008-08-06 20:17:10 UTC (rev 12551)
@@ -1,4 +1,4 @@
-
+
!
! this is the parameter file for static compilation of the solver
!
@@ -24,57 +24,57 @@
! ---------------------------
!
! exact total number of spectral elements in entire mesh =
- ! 224640.00000000000
+ ! 224640.000000000
! approximate total number of points in entire mesh =
- ! 15038376.000000000
+ ! 15038376.0000000
! approximate total number of degrees of freedom in entire mesh =
- ! 42811848.000000000
+ ! 42811848.0000000
!
! position of the mesh chunk at the surface:
! -----------------------------------------
!
- ! angular size in first direction in degrees = 90.000000
- ! angular size in second direction in degrees = 90.000000
+ ! angular size in first direction in degrees = 90.00000
+ ! angular size in second direction in degrees = 90.00000
!
- ! longitude of center in degrees = 0.0000000
- ! latitude of center in degrees = 90.000000
+ ! longitude of center in degrees = 0.0000000E+00
+ ! latitude of center in degrees = 90.00000
!
- ! angle of rotation of the first chunk = 0.0000000
+ ! angle of rotation of the first chunk = 0.0000000E+00
!
! corner 1
- ! longitude in degrees = -45.000000000000000
- ! latitude in degrees = 35.446575249587262
+ ! longitude in degrees = -45.0000000000000
+ ! latitude in degrees = 35.4465752495873
!
! corner 2
- ! longitude in degrees = 45.000000000000000
- ! latitude in degrees = 35.446575249587262
+ ! longitude in degrees = 45.0000000000000
+ ! latitude in degrees = 35.4465752495873
!
! corner 3
- ! longitude in degrees = -135.00000000000000
- ! latitude in degrees = 35.446575249587262
+ ! longitude in degrees = -135.000000000000
+ ! latitude in degrees = 35.4465752495873
!
! corner 4
- ! longitude in degrees = 135.00000000000000
- ! latitude in degrees = 35.446575249587262
+ ! longitude in degrees = 135.000000000000
+ ! latitude in degrees = 35.4465752495873
!
! resolution of the mesh at the surface:
! -------------------------------------
!
! spectral elements along a great circle = 256
! GLL points along a great circle = 1024
- ! average distance between points in degrees = 0.35156250
- ! average distance between points in km = 39.091965
- ! average size of a spectral element in km = 156.36786
+ ! average distance between points in degrees = 0.3515625
+ ! average distance between points in km = 39.09196
+ ! average size of a spectral element in km = 156.3679
!
! number of time steps = 7900
!
! number of seismic sources = 1
!
-
+
! approximate static memory needed by the solver:
! ----------------------------------------------
!
- ! size of static arrays per slice = 8.13465118408203125E-002 GB
+ ! size of static arrays per slice = 8.134651184082031E-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
@@ -82,39 +82,39 @@
! (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.32538604736328125 GB
- ! = 3.17759811878204346E-004 TB
+ ! size of static arrays for all slices = 0.325386047363281 GB
+ ! = 3.177598118782043E-004 TB
!
-
+
integer, parameter :: NEX_XI_VAL = 64
integer, parameter :: NEX_ETA_VAL = 64
-
+
integer, parameter :: NSPEC_CRUST_MANTLE = 8640
integer, parameter :: NSPEC_OUTER_CORE = 688
integer, parameter :: NSPEC_INNER_CORE = 32
-
+
integer, parameter :: NGLOB_CRUST_MANTLE = 576013
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_ANISO_MANTLE = 1
-
+
integer, parameter :: NSPEC_CRUST_MANTLE_ATTENUAT = 1
integer, parameter :: NSPEC_INNER_CORE_ATTENUATION = 1
-
+
integer, parameter :: NSPEC_CRUST_MANTLE_STR_OR_ATT = 1
integer, parameter :: NSPEC_INNER_CORE_STR_OR_ATT = 1
-
+
integer, parameter :: NSPEC_CRUST_MANTLE_STR_AND_ATT = 1
integer, parameter :: NSPEC_INNER_CORE_STR_AND_ATT = 1
-
+
integer, parameter :: NSPEC_CRUST_MANTLE_STRAIN_ONLY = 1
integer, parameter :: NSPEC_INNER_CORE_STRAIN_ONLY = 1
-
+
integer, parameter :: NSPEC_CRUST_MANTLE_ADJOINT = 1
integer, parameter :: NSPEC_OUTER_CORE_ADJOINT = 1
integer, parameter :: NSPEC_INNER_CORE_ADJOINT = 1
@@ -122,29 +122,29 @@
integer, parameter :: NGLOB_OUTER_CORE_ADJOINT = 1
integer, parameter :: NGLOB_INNER_CORE_ADJOINT = 1
integer, parameter :: NSPEC_OUTER_CORE_ROT_ADJOINT = 1
-
+
integer, parameter :: NSPEC_CRUST_MANTLE_STACEY = 1
integer, parameter :: NSPEC_OUTER_CORE_STACEY = 1
-
+
integer, parameter :: NGLOB_CRUST_MANTLE_OCEANS = 1
-
+
logical, parameter :: TRANSVERSE_ISOTROPY_VAL = .false.
-
+
logical, parameter :: ANISOTROPIC_3D_MANTLE_VAL = .false.
-
+
logical, parameter :: ANISOTROPIC_INNER_CORE_VAL = .false.
-
+
logical, parameter :: ATTENUATION_VAL = .false.
-
+
logical, parameter :: ATTENUATION_3D_VAL = .false.
-
+
logical, parameter :: ELLIPTICITY_VAL = .false.
-
+
logical, parameter :: GRAVITY_VAL = .false.
-
+
logical, parameter :: ROTATION_VAL = .false.
integer, parameter :: NSPEC_OUTER_CORE_ROTATION = 1
-
+
integer, parameter :: NGLOB1D_RADIAL_CM = 109
integer, parameter :: NGLOB1D_RADIAL_OC = 65
integer, parameter :: NGLOB1D_RADIAL_IC = 9
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90 2008-08-06 19:52:48 UTC (rev 12550)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call1.f90 2008-08-06 20:17:10 UTC (rev 12551)
@@ -6,8 +6,6 @@
omsb_crust_mantle_dble,factor_scale_crust_mantle_dble, omsb_inner_core_dble,factor_scale_inner_core_dble, &
one_minus_sum_beta_crust_mantle,factor_scale_crust_mantle, one_minus_sum_beta_inner_core,factor_scale_inner_core, &
factor_common_crust_mantle,factor_common_inner_core,factor_common_crust_mantle_dble, factor_common_inner_core_dble, &
-!! DK DK to do later, for oceans only
- rmass_ocean_load, &
!! DK DK already computed
myrank,sizeprocs,addressing,ichunk_slice,iproc_xi_slice,iproc_eta_slice,ibathy_topo, &
ibool_crust_mantle, ibool_outer_core, ibool_inner_core, idoubling_crust_mantle,idoubling_inner_core, &
@@ -37,9 +35,6 @@
xix_inner_core,xiy_inner_core,xiz_inner_core,etax_inner_core,etay_inner_core, &
etaz_inner_core,gammax_inner_core,gammay_inner_core,gammaz_inner_core, &
!! DK DK do not need to be initialized
- displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle, &
- displ_outer_core,veloc_outer_core,accel_outer_core,displ_inner_core,veloc_inner_core,accel_inner_core, &
buffer_send_chunkcorners_scalar,buffer_recv_chunkcorners_scalar, &
- buffer_send_chunkcorners_vector,buffer_recv_chunkcorners_vector, &
-R_memory_crust_mantle, epsilondev_crust_mantle, R_memory_inner_core, epsilondev_inner_core)
+ buffer_send_chunkcorners_vector,buffer_recv_chunkcorners_vector)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90 2008-08-06 19:52:48 UTC (rev 12550)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/call2.f90 2008-08-06 20:17:10 UTC (rev 12551)
@@ -6,8 +6,6 @@
omsb_crust_mantle_dble,factor_scale_crust_mantle_dble, omsb_inner_core_dble,factor_scale_inner_core_dble, &
one_minus_sum_beta_crust_mantle,factor_scale_crust_mantle, one_minus_sum_beta_inner_core,factor_scale_inner_core, &
factor_common_crust_mantle,factor_common_inner_core,factor_common_crust_mantle_dble, factor_common_inner_core_dble, &
-!! DK DK to do later, for oceans only
- rmass_ocean_load, &
!! DK DK already computed
myrank,sizeprocs,addressing,ichunk_slice,iproc_xi_slice,iproc_eta_slice,ibathy_topo, &
ibool_crust_mantle, ibool_outer_core, ibool_inner_core, idoubling_crust_mantle,idoubling_inner_core, &
@@ -37,9 +35,6 @@
xix_inner_core,xiy_inner_core,xiz_inner_core,etax_inner_core,etay_inner_core, &
etaz_inner_core,gammax_inner_core,gammay_inner_core,gammaz_inner_core, &
!! DK DK do not need to be initialized
- displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle, &
- displ_outer_core,veloc_outer_core,accel_outer_core,displ_inner_core,veloc_inner_core,accel_inner_core, &
buffer_send_chunkcorners_scalar,buffer_recv_chunkcorners_scalar, &
- buffer_send_chunkcorners_vector,buffer_recv_chunkcorners_vector, &
-R_memory_crust_mantle, epsilondev_crust_mantle, R_memory_inner_core, epsilondev_inner_core)
+ buffer_send_chunkcorners_vector,buffer_recv_chunkcorners_vector)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90 2008-08-06 19:52:48 UTC (rev 12550)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/deallocate.f90 2008-08-06 20:17:10 UTC (rev 12551)
@@ -188,88 +188,3 @@
print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
endif
-
- deallocate(rmass_ocean_load,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
-!---
-
- deallocate(displ_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(veloc_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(accel_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(displ_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(veloc_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(accel_outer_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(displ_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(veloc_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
- deallocate(accel_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
-!---
-
- deallocate(R_memory_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(R_memory_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
-!---
-
- deallocate(epsilondev_crust_mantle,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
- deallocate(epsilondev_inner_core,STAT=ier )
- if (ier /= 0) then
- print *,"ERROR can not deallocate in deallocate.f90 ier=",ier
- endif
-
-
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90 2008-08-06 19:52:48 UTC (rev 12550)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/declar.f90 2008-08-06 20:17:10 UTC (rev 12551)
@@ -6,31 +6,22 @@
xelm_store_outer_core,yelm_store_outer_core,zelm_store_outer_core, &
xelm_store_inner_core,yelm_store_inner_core,zelm_store_inner_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:,:,:) :: R_memory_crust_mantle
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:,:) :: epsilondev_crust_mantle
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:,:,:) :: R_memory_inner_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:,:) :: epsilondev_inner_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:) :: rmass_ocean_load
real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:) :: &
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
real(kind=CUSTOM_REAL), allocatable, dimension(:) :: xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:) :: &
- displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle
real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:) :: &
xix_outer_core,xiy_outer_core,xiz_outer_core,&
etax_outer_core,etay_outer_core,etaz_outer_core, &
gammax_outer_core,gammay_outer_core,gammaz_outer_core
real(kind=CUSTOM_REAL), allocatable, dimension(:) :: xstore_outer_core,ystore_outer_core,zstore_outer_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:) :: displ_outer_core,veloc_outer_core,accel_outer_core
real(kind=CUSTOM_REAL), allocatable, dimension(:,:,:,:) :: &
xix_inner_core,xiy_inner_core,xiz_inner_core,&
etax_inner_core,etay_inner_core,etaz_inner_core, &
gammax_inner_core,gammay_inner_core,gammaz_inner_core
real(kind=CUSTOM_REAL), allocatable, dimension(:) :: xstore_inner_core,ystore_inner_core,zstore_inner_core
- real(kind=CUSTOM_REAL), allocatable, dimension(:,:) :: displ_inner_core,veloc_inner_core,accel_inner_core
!!!!!!!!!!!!!!!! DK DK for merged version, all the arrays below are allocated statically instead
!!!!!!!!!!!!!!!! DK DK for merged version, all the arrays below are allocated statically instead
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90 2008-08-06 19:52:48 UTC (rev 12550)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90 2008-08-06 20:17:10 UTC (rev 12551)
@@ -2112,9 +2112,6 @@
deallocate(zelm_store_inner_core)
!! DK DK for the merged version
- include 'allocate_after_2.f90'
-
-!! DK DK for the merged version
include 'call1.f90'
!! DK DK for now use variables just to make sure we don't get warning about unused variables
! include 'oldstuff/dummy_use_variables.f90'
More information about the cig-commits
mailing list