[cig-commits] r22523 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: create_header_file meshfem3D shared specfem3D

dkomati1 at geodynamics.org dkomati1 at geodynamics.org
Sat Jul 6 15:28:37 PDT 2013 

Author: dkomati1
Date: 2013-07-06 15:28:37 -0700 (Sat, 06 Jul 2013)
New Revision: 22523

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/locate_regular_points.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
Log:
defined NM_KL_REG_PTS_VAL in order to reduce total memory size when regular grid kernel output is off


Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90	2013-07-06 21:32:22 UTC (rev 22522)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/create_header_file.f90	2013-07-06 22:28:37 UTC (rev 22523)
@@ -213,7 +213,7 @@
                   NGLOB_INNER_CORE_ADJOINT,NSPEC_OUTER_CORE_ROT_ADJOINT, &
                   NSPEC_CRUST_MANTLE_STACEY,NSPEC_OUTER_CORE_STACEY, &
                   NGLOB_CRUST_MANTLE_OCEANS,NSPEC_OUTER_CORE_ROTATION, &
-                  SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME)
+                  SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME,SAVE_REGULAR_KL)
 
   print *
   print *,'edit file OUTPUT_FILES/values_from_mesher.h to see'

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90	2013-07-06 21:32:22 UTC (rev 22522)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D.f90	2013-07-06 22:28:37 UTC (rev 22523)
@@ -872,7 +872,7 @@
                     NGLOB_INNER_CORE_ADJOINT,NSPEC_OUTER_CORE_ROT_ADJOINT, &
                     NSPEC_CRUST_MANTLE_STACEY,NSPEC_OUTER_CORE_STACEY, &
                     NGLOB_CRUST_MANTLE_OCEANS,NSPEC_OUTER_CORE_ROTATION, &
-                    SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME)
+                    SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME,SAVE_REGULAR_KL)
 
   endif   ! end of section executed by main process only
 

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90	2013-07-06 21:32:22 UTC (rev 22522)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.f90	2013-07-06 22:28:37 UTC (rev 22523)
@@ -51,7 +51,7 @@
                         NGLOB_INNER_CORE_ADJOINT,NSPEC_OUTER_CORE_ROT_ADJOINT, &
                         NSPEC_CRUST_MANTLE_STACEY,NSPEC_OUTER_CORE_STACEY, &
                         NGLOB_CRUST_MANTLE_OCEANS,NSPEC_OUTER_CORE_ROTATION, &
-                        SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME)
+                        SIMULATION_TYPE,SAVE_FORWARD,MOVIE_VOLUME,SAVE_REGULAR_KL)
 
   implicit none
 
@@ -62,7 +62,8 @@
   integer NEX_XI,NEX_ETA,NPROC,NPROCTOT,NCHUNKS,NSOURCES,NSTEP
 
   logical TRANSVERSE_ISOTROPY,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-          ELLIPTICITY,GRAVITY,ROTATION,TOPOGRAPHY,OCEANS,ATTENUATION,ATTENUATION_3D,INCLUDE_CENTRAL_CUBE
+          ELLIPTICITY,GRAVITY,ROTATION,TOPOGRAPHY,OCEANS,ATTENUATION,ATTENUATION_3D,INCLUDE_CENTRAL_CUBE, &
+          SAVE_REGULAR_KL
 
   double precision ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES, &
           CENTER_LONGITUDE_IN_DEGREES,CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH
@@ -552,7 +553,14 @@
     write(IOUT,*) 'integer, parameter :: NSPEC_CRUST_MANTLE_3DMOVIE = 1'
     write(IOUT,*) 'integer, parameter :: NGLOB_CRUST_MANTLE_3DMOVIE = 1'
   endif
+  write(IOUT,*)
 
+  if (SAVE_REGULAR_KL) then
+    write(IOUT,*) 'integer, parameter :: NM_KL_REG_PTS_VAL = NM_KL_REG_PTS'
+  else
+    write(IOUT,*) 'integer, parameter :: NM_KL_REG_PTS_VAL = 1'
+  endif
+
   close(IOUT)
 
   end subroutine save_header_file

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/locate_regular_points.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/locate_regular_points.f90	2013-07-06 21:32:22 UTC (rev 22522)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/locate_regular_points.f90	2013-07-06 22:28:37 UTC (rev 22523)
@@ -159,11 +159,13 @@
                              hxir_reg,hetar_reg,hgammar_reg)
 
   implicit none
+
   include 'constants.h'
+  include "OUTPUT_FILES/values_from_mesher.h"
 
   ! declarations of regular grid model
   integer, intent(in) :: npoints_slice
-  integer, dimension(NM_KL_REG_PTS), intent(in) :: points_slice
+  integer, dimension(NM_KL_REG_PTS_VAL), intent(in) :: points_slice
 
   type kl_reg_grid_variables
     sequence
@@ -190,10 +192,10 @@
   double precision, dimension(NGLLZ), intent(in) :: zigll
 
   ! output
-  integer, dimension(NM_KL_REG_PTS), intent(out) :: ispec_reg
-  real(kind=CUSTOM_REAL), dimension(NGLLX,NM_KL_REG_PTS), intent(out) :: hxir_reg
-  real(kind=CUSTOM_REAL), dimension(NGLLY,NM_KL_REG_PTS), intent(out) :: hetar_reg
-  real(kind=CUSTOM_REAL), dimension(NGLLZ,NM_KL_REG_PTS), intent(out) :: hgammar_reg
+  integer, dimension(NM_KL_REG_PTS_VAL), intent(out) :: ispec_reg
+  real(kind=CUSTOM_REAL), dimension(NGLLX,NM_KL_REG_PTS_VAL), intent(out) :: hxir_reg
+  real(kind=CUSTOM_REAL), dimension(NGLLY,NM_KL_REG_PTS_VAL), intent(out) :: hetar_reg
+  real(kind=CUSTOM_REAL), dimension(NGLLZ,NM_KL_REG_PTS_VAL), intent(out) :: hgammar_reg
 
   ! GLL number of anchors
   integer, dimension(NGNOD) :: iaddx, iaddy, iaddr

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk	2013-07-06 21:32:22 UTC (rev 22522)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/rules.mk	2013-07-06 22:28:37 UTC (rev 22523)
@@ -315,7 +315,7 @@
 $O/locate_receivers.o: ${SETUP}/constants.h $S/locate_receivers.f90
 	${MPIFCCOMPILE_CHECK} -c -o $O/locate_receivers.o ${FCFLAGS_f90} $S/locate_receivers.f90
 
-$O/locate_regular_points.o: ${SETUP}/constants.h $S/locate_regular_points.f90
+$O/locate_regular_points.o: ${SETUP}/constants.h ${OUTPUT}/values_from_mesher.h $S/locate_regular_points.f90
 	${MPIFCCOMPILE_CHECK} -c -o $O/locate_regular_points.o ${FCFLAGS_f90} $S/locate_regular_points.f90
 
 $O/locate_sources.o: ${SETUP}/constants.h $S/locate_sources.f90

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90	2013-07-06 21:32:22 UTC (rev 22522)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/save_regular_kernels.f90	2013-07-06 22:28:37 UTC (rev 22523)
@@ -45,10 +45,10 @@
   integer myrank
 
   integer, intent(in) :: npoints_slice
-  real, dimension(NGLLX, NM_KL_REG_PTS), intent(in) :: hxir_reg
-  real, dimension(NGLLY, NM_KL_REG_PTS), intent(in) :: hetar_reg
-  real, dimension(NGLLZ, NM_KL_REG_PTS), intent(in) :: hgammar_reg
-  integer, dimension(NM_KL_REG_PTS), intent(in) :: ispec_reg
+  real, dimension(NGLLX, NM_KL_REG_PTS_VAL), intent(in) :: hxir_reg
+  real, dimension(NGLLY, NM_KL_REG_PTS_VAL), intent(in) :: hetar_reg
+  real, dimension(NGLLZ, NM_KL_REG_PTS_VAL), intent(in) :: hgammar_reg
+  integer, dimension(NM_KL_REG_PTS_VAL), intent(in) :: ispec_reg
 
   double precision :: scale_t,scale_displ
 

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90	2013-07-06 21:32:22 UTC (rev 22522)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/specfem3D.F90	2013-07-06 22:28:37 UTC (rev 22523)
@@ -660,11 +660,11 @@
 
   integer isp, npoints_slice
   integer, dimension(:), allocatable :: slice_number
-  integer, dimension(NM_KL_REG_PTS) :: points_slice
-  integer, dimension(NM_KL_REG_PTS) :: ispec_reg
-  real, dimension(NGLLX, NM_KL_REG_PTS) :: hxir_reg
-  real, dimension(NGLLY, NM_KL_REG_PTS) :: hetar_reg
-  real, dimension(NGLLZ, NM_KL_REG_PTS) :: hgammar_reg
+  integer, dimension(NM_KL_REG_PTS_VAL) :: points_slice
+  integer, dimension(NM_KL_REG_PTS_VAL) :: ispec_reg
+  real, dimension(NGLLX, NM_KL_REG_PTS_VAL) :: hxir_reg
+  real, dimension(NGLLY, NM_KL_REG_PTS_VAL) :: hetar_reg
+  real, dimension(NGLLZ, NM_KL_REG_PTS_VAL) :: hgammar_reg
 
   real(kind=CUSTOM_REAL), dimension(:,:,:,:,:), allocatable :: absorb_xmin_crust_mantle5, &
      absorb_xmax_crust_mantle5, absorb_ymin_crust_mantle5, absorb_ymax_crust_mantle5

More information about the CIG-COMMITS mailing list