[cig-commits] r12563 - seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src

dkomati1 at geodynamics.org dkomati1 at geodynamics.org
Wed Aug 6 15:18:19 PDT 2008


Author: dkomati1
Date: 2008-08-06 15:18:19 -0700 (Wed, 06 Aug 2008)
New Revision: 12563

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/attenuation_model.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_element_properties.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_inner_core.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/create_regions_mesh.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/get_model.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90
Log:
changed allocate(AM_V%Qtau_s(N_SLS)) from heap to stack


Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/attenuation_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/attenuation_model.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/attenuation_model.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -78,7 +78,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps
@@ -269,7 +269,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps
@@ -399,7 +399,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps
@@ -474,7 +474,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps
@@ -496,8 +496,6 @@
   AM_V%min_period = min * 1.0d0
   AM_V%max_period = max * 1.0d0
 
-  allocate(AM_V%Qtau_s(N_SLS))
-
   call attenuation_tau_sigma(AM_V%Qtau_s, N_SLS, AM_V%min_period, AM_V%max_period)
   call attenuation_source_frequency(AM_V%QT_c_source, AM_V%min_period, AM_V%max_period)
 
@@ -629,7 +627,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps
@@ -786,7 +784,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps
@@ -858,7 +856,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_element_properties.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_element_properties.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_element_properties.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -67,7 +67,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -47,7 +47,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_inner_core.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_inner_core.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_inner_core.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -48,7 +48,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/create_regions_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/create_regions_mesh.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/create_regions_mesh.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -143,7 +143,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/get_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/get_model.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/get_model.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -70,7 +70,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q                 ! Steps

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/meshfem3D.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -206,7 +206,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: Qs                 ! Steps
@@ -1358,13 +1358,6 @@
   if(ATTENUATION .and. ATTENUATION_3D) then
     if(myrank == 0) call read_attenuation_model(MIN_ATTENUATION_PERIOD, MAX_ATTENUATION_PERIOD, AM_V)
 
-    if(myrank /= 0) then
-      allocate(AM_V%Qtau_s(N_SLS),STAT=ier)
-      if (ier /= 0) then
-        print *,"ABORTING can not allocate in meshfem3D ier=",ier
-        call MPI_Abort(MPI_COMM_WORLD,errorcode,ier)
-      endif
-    endif
     call MPI_BCAST(AM_V%min_period,  1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ier)
     call MPI_BCAST(AM_V%max_period,  1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ier)
     call MPI_BCAST(AM_V%QT_c_source, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ier)
@@ -1533,9 +1526,6 @@
   npointot = NSPEC(iregion_code) * NGLLX * NGLLY * NGLLZ
 
 ! use dynamic allocation to allocate memory for arrays
-!! DK DK suppressed this for merged version
-! allocate(idoubling(NSPEC(iregion_code)),STAT=ier)
-! allocate(ibool(NGLLX,NGLLY,NGLLZ,NSPEC(iregion_code)),STAT=ier)
   allocate(xstore(NGLLX,NGLLY,NGLLZ,NSPEC(iregion_code)),STAT=ier)
   if (ier /= 0) then
     print *,"ABORTING can not allocate in meshfem3D ier=",ier
@@ -1886,9 +1876,6 @@
   endif
 
 ! deallocate arrays used for that region
-!! DK DK suppressed this for merged version
-! deallocate(idoubling)
-! deallocate(ibool)
   deallocate(xstore)
   deallocate(ystore)
   deallocate(zstore)
@@ -2032,13 +2019,6 @@
 
   endif   ! end of section executed by main process only
 
-! deallocate arrays used for mesh generation
-!! DK DK suppressed in the merged version because these arrays will be transmitted to the solver
-! deallocate(addressing)
-! deallocate(ichunk_slice)
-! deallocate(iproc_xi_slice)
-! deallocate(iproc_eta_slice)
-
 ! elapsed time since beginning of mesh generation
   if(myrank == 0) then
     tCPU = MPI_WTIME() - time_start

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90	2008-08-06 21:54:50 UTC (rev 12562)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/specfem3D.f90	2008-08-06 22:18:19 UTC (rev 12563)
@@ -215,7 +215,7 @@
     sequence
     double precision min_period, max_period
     double precision                          :: QT_c_source        ! Source Frequency
-    double precision, dimension(:), pointer   :: Qtau_s             ! tau_sigma
+    double precision, dimension(N_SLS)        :: Qtau_s             ! tau_sigma
     double precision, dimension(:), pointer   :: QrDisc             ! Discontinutitues Defined
     double precision, dimension(:), pointer   :: Qr                 ! Radius
     integer, dimension(:), pointer            :: interval_Q         ! Steps



More information about the cig-commits mailing list