[cig-commits] r22635 - seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2013-07-17 05:59:27 -0700 (Wed, 17 Jul 2013)
New Revision: 22635

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
Log:
removed statement that forced EXACT_MASS_MATRIX_FOR_ROTATION to be set to .true. when ABSORBING_CONDITIONS is on


Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90	2013-07-17 11:04:05 UTC (rev 22634)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90	2013-07-17 12:59:27 UTC (rev 22635)
@@ -452,16 +452,16 @@
     endif
   endif
 
-! rmassx_crust_mantle,rmassy_crust_mantle for EXACT_MASS_MATRIX_FOR_ROTATION
+! rmassx_crust_mantle,rmassy_crust_mantle for EXACT_MASS_MATRIX_FOR_ROTATION and/or ABSORBING_CONDITIONS
   static_memory_size = static_memory_size + 2.d0*NGLOB_XY_CM*4.d0*dble(CUSTOM_REAL)
 
-! b_rmassx_crust_mantle,b_rmassy_crust_mantle for EXACT_MASS_MATRIX_FOR_ROTATION
+! b_rmassx_crust_mantle,b_rmassy_crust_mantle for EXACT_MASS_MATRIX_FOR_ROTATION and/or ABSORBING_CONDITIONS
   static_memory_size = static_memory_size + 2.d0*NGLOB_XY_CM_BACKWARD*4.d0*dble(CUSTOM_REAL)
 
-! rmassx_inner_core,rmassy_inner_core for EXACT_MASS_MATRIX_FOR_ROTATION
+! rmassx_inner_core,rmassy_inner_core for EXACT_MASS_MATRIX_FOR_ROTATION and/or ABSORBING_CONDITIONS
   static_memory_size = static_memory_size + 2.d0*NGLOB_XY_IC*4.d0*dble(CUSTOM_REAL)
 
-! b_rmassx_inner_core,b_rmassy_inner_core for EXACT_MASS_MATRIX_FOR_ROTATION
+! b_rmassx_inner_core,b_rmassy_inner_core for EXACT_MASS_MATRIX_FOR_ROTATION and/or ABSORBING_CONDITIONS
   static_memory_size = static_memory_size + 2.d0*NGLOB_XY_IC_BACKWARD*4.d0*dble(CUSTOM_REAL)
 
   end subroutine memory_eval

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90	2013-07-17 11:04:05 UTC (rev 22634)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90	2013-07-17 12:59:27 UTC (rev 22635)
@@ -269,8 +269,7 @@
                         ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES, &
                         ATTENUATION_3D,ATTENUATION,ABSORBING_CONDITIONS, &
                         INCLUDE_CENTRAL_CUBE,OUTPUT_SEISMOS_SAC_ALPHANUM, &
-                        ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION, &
-                        ROTATION,EXACT_MASS_MATRIX_FOR_ROTATION)
+                        ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION)
 
   ! check that mesh can be coarsened in depth three or four times
   CUT_SUPERBRICK_XI=.false.
@@ -807,8 +806,7 @@
                         ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES, &
                         ATTENUATION_3D,ATTENUATION,ABSORBING_CONDITIONS, &
                         INCLUDE_CENTRAL_CUBE,OUTPUT_SEISMOS_SAC_ALPHANUM, &
-                        ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION, &
-                        ROTATION,EXACT_MASS_MATRIX_FOR_ROTATION)
+                        ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION)
 
   implicit none
 
@@ -820,8 +818,7 @@
 
   logical ATTENUATION_3D,ATTENUATION,ABSORBING_CONDITIONS, &
           INCLUDE_CENTRAL_CUBE,OUTPUT_SEISMOS_SAC_ALPHANUM, &
-          ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION, &
-          ROTATION,EXACT_MASS_MATRIX_FOR_ROTATION
+          ANISOTROPIC_KL,SAVE_TRANSVERSE_KL_ONLY,PARTIAL_PHYS_DISPERSION_ONLY,UNDO_ATTENUATION
 
 ! checks parameters
 
@@ -851,9 +848,6 @@
   if(PARTIAL_PHYS_DISPERSION_ONLY .and. UNDO_ATTENUATION) &
     stop 'cannot have both PARTIAL_PHYS_DISPERSION_ONLY and UNDO_ATTENUATION, they are mutually exclusive'
 
-  if(ROTATION .and. ABSORBING_CONDITIONS .and. .not. EXACT_MASS_MATRIX_FOR_ROTATION) stop &
-    'set EXACT_MASS_MATRIX_FOR_ROTATION to .true. when ABSORBING_CONDITIONS is on because there is then almost no additional cost'
-
   if (OUTPUT_SEISMOS_SAC_ALPHANUM .and. (mod(NTSTEP_BETWEEN_OUTPUT_SEISMOS,5)/=0)) &
     stop 'if OUTPUT_SEISMOS_SAC_ALPHANUM = .true. then NTSTEP_BETWEEN_OUTPUT_SEISMOS must be a multiple of 5, check the Par_file'