[cig-commits] r17205 - seismo/3D/SPECFEM3D_GLOBE/trunk

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2010-09-21 10:45:45 -0700 (Tue, 21 Sep 2010)
New Revision: 17205

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/initialize_simulation.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/save_header_file.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90
Log:
added a check for Deville's products: verify that NGLL == 5


Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/initialize_simulation.f90	2010-09-21 00:45:38 UTC (rev 17204)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/initialize_simulation.f90	2010-09-21 17:45:45 UTC (rev 17205)
@@ -480,7 +480,12 @@
          hprimewgll_xx,hprimewgll_yy,hprimewgll_zz, &
          wgllwgll_xy,wgllwgll_xz,wgllwgll_yz,wgll_cube)
 
-  if( USE_DEVILLE_VAL ) then
+  if( USE_DEVILLE_PRODUCTS_VAL ) then
+
+  ! check that optimized routines from Deville et al. (2002) can be used
+    if(NGLLX /= 5 .or. NGLLY /= 5 .or. NGLLZ /= 5) &
+      stop 'Deville et al. (2002) routines can only be used if NGLLX = NGLLY = NGLLZ = 5'
+
     ! define transpose of derivation matrix
     do j = 1,NGLLY
       do i = 1,NGLLX

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/save_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/save_header_file.f90	2010-09-21 00:45:38 UTC (rev 17204)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/save_header_file.f90	2010-09-21 17:45:45 UTC (rev 17205)
@@ -489,9 +489,9 @@
 
   ! deville routines only implemented for NGLLX = NGLLY = NGLLZ = 5
   if( NGLLX == 5 .and. NGLLY == 5 .and. NGLLZ == 5 ) then
-    write(IOUT,*) 'logical, parameter :: USE_DEVILLE_VAL = .true.'
+    write(IOUT,*) 'logical, parameter :: USE_DEVILLE_PRODUCTS_VAL = .true.'
   else
-    write(IOUT,*) 'logical, parameter :: USE_DEVILLE_VAL = .false.'
+    write(IOUT,*) 'logical, parameter :: USE_DEVILLE_PRODUCTS_VAL = .false.'
   endif
 
   ! backward/reconstruction of forward wavefield: 

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90	2010-09-21 00:45:38 UTC (rev 17204)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/specfem3D.f90	2010-09-21 17:45:45 UTC (rev 17205)
@@ -1957,7 +1957,7 @@
       time = (dble(it-1)*DT-t0)*scale_t_inv
     endif
 
-    if( USE_DEVILLE_VAL ) then
+    if( USE_DEVILLE_PRODUCTS_VAL ) then
       ! uses deville et al. (2002) routine
       call compute_forces_outer_core_Dev(time,deltat,two_omega_earth, &
            A_array_rotation,B_array_rotation,d_ln_density_dr_table, &
@@ -1995,7 +1995,7 @@
         time = (dble(NSTEP-it)*DT-t0)*scale_t_inv
       endif
 
-      if( USE_DEVILLE_VAL ) then
+      if( USE_DEVILLE_PRODUCTS_VAL ) then
         ! uses deville et al. (2002) routine
         call compute_forces_outer_core_Dev(time,b_deltat,b_two_omega_earth, &
            b_A_array_rotation,b_B_array_rotation,d_ln_density_dr_table, &
@@ -2174,7 +2174,7 @@
 
     ! for anisotropy and gravity, x y and z contain r theta and phi
 
-    if( USE_DEVILLE_VAL ) then
+    if( USE_DEVILLE_PRODUCTS_VAL ) then
       call compute_forces_crust_mantle_Dev(minus_gravity_table,density_table,minus_deriv_gravity_table, &
           displ_crust_mantle,accel_crust_mantle, &
           xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle, &
@@ -2228,7 +2228,7 @@
 
     if (SIMULATION_TYPE == 3) then
     ! for anisotropy and gravity, x y and z contain r theta and phi
-      if( USE_DEVILLE_VAL ) then
+      if( USE_DEVILLE_PRODUCTS_VAL ) then
         call compute_forces_crust_mantle_Dev(minus_gravity_table,density_table,minus_deriv_gravity_table, &
           b_displ_crust_mantle,b_accel_crust_mantle, &
           xstore_crust_mantle,ystore_crust_mantle,zstore_crust_mantle, &
@@ -2310,7 +2310,7 @@
 
 
     ! deville routine
-    if( USE_DEVILLE_VAL ) then
+    if( USE_DEVILLE_PRODUCTS_VAL ) then
       call compute_forces_inner_core_Dev(minus_gravity_table,density_table,minus_deriv_gravity_table, &
           displ_inner_core,accel_inner_core, &
           xstore_inner_core,ystore_inner_core,zstore_inner_core, &
@@ -2349,7 +2349,7 @@
     endif
 
     if (SIMULATION_TYPE == 3) then
-      if( USE_DEVILLE_VAL ) then
+      if( USE_DEVILLE_PRODUCTS_VAL ) then
         call compute_forces_inner_core_Dev(minus_gravity_table,density_table,minus_deriv_gravity_table, &
           b_displ_inner_core,b_accel_inner_core, &
           xstore_inner_core,ystore_inner_core,zstore_inner_core, &