[cig-commits] [commit] devel, master: final cosmetic changes (b38ab36)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:10:01 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit b38ab3633a63875e32df57c5a6fbcf39b736beea
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Sat Apr 12 01:51:41 2014 +0200
final cosmetic changes
>---------------------------------------------------------------
b38ab3633a63875e32df57c5a6fbcf39b736beea
src/specfem3D/compute_element.F90 | 8 +++---
src/specfem3D/compute_element_att_memory.F90 | 34 +++++++++++------------
src/specfem3D/compute_element_strain.F90 | 10 +++----
src/specfem3D/compute_forces_crust_mantle_Dev.F90 | 6 ++--
src/specfem3D/compute_forces_inner_core_Dev.F90 | 8 +++---
src/specfem3D/compute_forces_outer_core_Dev.F90 | 14 +++++-----
6 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/specfem3D/compute_element.F90 b/src/specfem3D/compute_element.F90
index 51d63e0..5d3b78b 100644
--- a/src/specfem3D/compute_element.F90
+++ b/src/specfem3D/compute_element.F90
@@ -26,7 +26,7 @@
!=====================================================================
! we switch between vectorized and non-vectorized version by using pre-processor flag FORCE_VECTORIZATION
-! and macros INDEX_IJK, DO_LOOP_IJK, enddo_LOOP_IJK defined in config.fh
+! and macros INDEX_IJK, DO_LOOP_IJK, ENDDO_LOOP_IJK defined in config.fh
#include "config.fh"
@@ -406,7 +406,7 @@
tempy3(INDEX_IJK) = jacobianl * (sigma_xy*gammaxl + sigma_yy*gammayl + sigma_zy*gammazl) ! this goes to accel_y
tempz3(INDEX_IJK) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
end subroutine compute_element_iso
@@ -978,7 +978,7 @@
tempy3(INDEX_IJK) = jacobianl * (sigma_xy*gammaxl + sigma_yy*gammayl + sigma_zy*gammazl) ! this goes to accel_y
tempz3(INDEX_IJK) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
end subroutine compute_element_tiso
@@ -1385,7 +1385,7 @@
tempy3(INDEX_IJK) = jacobianl * (sigma_xy*gammaxl + sigma_yy*gammayl + sigma_zy*gammazl) ! this goes to accel_y
tempz3(INDEX_IJK) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
end subroutine compute_element_aniso
diff --git a/src/specfem3D/compute_element_att_memory.F90 b/src/specfem3D/compute_element_att_memory.F90
index 39d3a12..bed89ba 100644
--- a/src/specfem3D/compute_element_att_memory.F90
+++ b/src/specfem3D/compute_element_att_memory.F90
@@ -26,7 +26,7 @@
!=====================================================================
! we switch between vectorized and non-vectorized version by using pre-processor flag FORCE_VECTORIZATION
-! and macros INDEX_IJK, DO_LOOP_IJK, enddo_LOOP_IJK defined in config.fh
+! and macros INDEX_IJK, DO_LOOP_IJK, ENDDO_LOOP_IJK defined in config.fh
#include "config.fh"
@@ -114,13 +114,13 @@
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(INDEX_IJK,i_SLS,ispec) * c44store(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
else
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(INDEX_IJK,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
@@ -130,13 +130,13 @@
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(1,1,1,i_SLS,ispec) * c44store(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
else
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(1,1,1,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
endif
@@ -159,7 +159,7 @@
R_yz(INDEX_IJK,i_SLS,ispec) = alphaval(i_SLS) * R_yz(INDEX_IJK,i_SLS,ispec) + factor_common_c44_muv(INDEX_IJK) * &
(betaval(i_SLS) * epsilondev_yz(INDEX_IJK,ispec) + gammaval(i_SLS) * epsilondev_loc(INDEX_IJK,5))
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
enddo ! i_SLS
@@ -246,11 +246,11 @@
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(INDEX_IJK,i_SLS,ispec) * c44store(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
else
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(INDEX_IJK,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
else
@@ -258,11 +258,11 @@
if(ANISOTROPIC_3D_MANTLE_VAL) then
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(1,1,1,i_SLS,ispec) * c44store(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
else
DO_LOOP_IJK
factor_common_c44_muv(INDEX_IJK) = factor_common(1,1,1,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
endif
@@ -296,7 +296,7 @@
R_xz(INDEX_IJK,i_SLS,ispec) = R_xz(INDEX_IJK,i_SLS,ispec) + BETA_LDDRK(istage) * R_xz_lddrk(INDEX_IJK,i_SLS,ispec)
R_yz(INDEX_IJK,i_SLS,ispec) = R_yz(INDEX_IJK,i_SLS,ispec) + BETA_LDDRK(istage) * R_yz_lddrk(INDEX_IJK,i_SLS,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
enddo ! i_SLS
@@ -384,13 +384,13 @@
DO_LOOP_IJK
factor_common_use(INDEX_IJK) = factor_common(INDEX_IJK,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
else
DO_LOOP_IJK
factor_common_use(INDEX_IJK) = factor_common(1,1,1,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
@@ -412,7 +412,7 @@
R_yz(INDEX_IJK,i_SLS,ispec) = alphaval(i_SLS) * R_yz(INDEX_IJK,i_SLS,ispec) + factor_common_use(INDEX_IJK) * &
(betaval(i_SLS) * epsilondev_yz(INDEX_IJK,ispec) + gammaval(i_SLS) * epsilondev_loc(INDEX_IJK,5))
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
enddo ! N_SLS
@@ -497,11 +497,11 @@
if( ATTENUATION_3D_VAL .or. ATTENUATION_1D_WITH_3D_STORAGE_VAL ) then
DO_LOOP_IJK
factor_common_use(INDEX_IJK) = factor_common(INDEX_IJK,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
else
DO_LOOP_IJK
factor_common_use(INDEX_IJK) = factor_common(1,1,1,i_SLS,ispec) * muvstore(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
! updates memory variables
@@ -533,7 +533,7 @@
R_xz(INDEX_IJK,i_SLS,ispec) = R_xz(INDEX_IJK,i_SLS,ispec) + BETA_LDDRK(istage) * R_xz_lddrk(INDEX_IJK,i_SLS,ispec)
R_yz(INDEX_IJK,i_SLS,ispec) = R_yz(INDEX_IJK,i_SLS,ispec) + BETA_LDDRK(istage) * R_yz_lddrk(INDEX_IJK,i_SLS,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
enddo
diff --git a/src/specfem3D/compute_element_strain.F90 b/src/specfem3D/compute_element_strain.F90
index 610c52e..41e31b9 100644
--- a/src/specfem3D/compute_element_strain.F90
+++ b/src/specfem3D/compute_element_strain.F90
@@ -26,7 +26,7 @@
!=====================================================================
! we switch between vectorized and non-vectorized version by using pre-processor flag FORCE_VECTORIZATION
-! and macros INDEX_IJK, DO_LOOP_IJK, enddo_LOOP_IJK defined in config.fh
+! and macros INDEX_IJK, DO_LOOP_IJK, ENDDO_LOOP_IJK defined in config.fh
#include "config.fh"
@@ -83,7 +83,7 @@
dummyy_loc(INDEX_IJK) = displ(2,iglob)
dummyz_loc(INDEX_IJK) = displ(3,iglob)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! deville optimizations
! computes 1. matrix multiplication for tempx1,..
@@ -135,7 +135,7 @@
epsilondev_loc(INDEX_IJK,4) = 0.5_CUSTOM_REAL * duzdxl_plus_duxdzl
epsilondev_loc(INDEX_IJK,5) = 0.5_CUSTOM_REAL * duzdyl_plus_duydzl
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
contains
@@ -501,7 +501,7 @@
dummyy_loc(INDEX_IJK) = displ(2,iglob) + deltat * veloc(2,iglob)
dummyz_loc(INDEX_IJK) = displ(3,iglob) + deltat * veloc(3,iglob)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! deville optimizations
! computes 1. matrix multiplication for tempx1,..
@@ -563,7 +563,7 @@
epsilondev_xz_loc_nplus1(INDEX_IJK,ispec) = 0.5_CUSTOM_REAL * duzdxl_plus_duxdzl
epsilondev_yz_loc_nplus1(INDEX_IJK,ispec) = 0.5_CUSTOM_REAL * duzdyl_plus_duydzl
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
contains
diff --git a/src/specfem3D/compute_forces_crust_mantle_Dev.F90 b/src/specfem3D/compute_forces_crust_mantle_Dev.F90
index 3e3b4ad..9a46457 100644
--- a/src/specfem3D/compute_forces_crust_mantle_Dev.F90
+++ b/src/specfem3D/compute_forces_crust_mantle_Dev.F90
@@ -26,7 +26,7 @@
!=====================================================================
! we switch between vectorized and non-vectorized version by using pre-processor flag FORCE_VECTORIZATION
-! and macros INDEX_IJK, DO_LOOP_IJK, enddo_LOOP_IJK defined in config.fh
+! and macros INDEX_IJK, DO_LOOP_IJK, ENDDO_LOOP_IJK defined in config.fh
#include "config.fh"
@@ -168,7 +168,7 @@
dummyy_loc(INDEX_IJK) = displ_crust_mantle(2,iglob)
dummyz_loc(INDEX_IJK) = displ_crust_mantle(3,iglob)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! subroutines adapted from Deville, Fischer and Mund, High-order methods
! for incompressible fluid flow, Cambridge University Press (2002),
@@ -257,7 +257,7 @@
sum_terms(INDEX_IJK,2) = - (fac1*newtempy1(INDEX_IJK) + fac2*newtempy2(INDEX_IJK) + fac3*newtempy3(INDEX_IJK))
sum_terms(INDEX_IJK,3) = - (fac1*newtempz1(INDEX_IJK) + fac2*newtempz2(INDEX_IJK) + fac3*newtempz3(INDEX_IJK))
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! adds gravity terms
if(GRAVITY_VAL) then
diff --git a/src/specfem3D/compute_forces_inner_core_Dev.F90 b/src/specfem3D/compute_forces_inner_core_Dev.F90
index c57751b..1e48a11 100644
--- a/src/specfem3D/compute_forces_inner_core_Dev.F90
+++ b/src/specfem3D/compute_forces_inner_core_Dev.F90
@@ -26,7 +26,7 @@
!=====================================================================
! we switch between vectorized and non-vectorized version by using pre-processor flag FORCE_VECTORIZATION
-! and macros INDEX_IJK, DO_LOOP_IJK, enddo_LOOP_IJK defined in config.fh
+! and macros INDEX_IJK, DO_LOOP_IJK, ENDDO_LOOP_IJK defined in config.fh
#include "config.fh"
@@ -184,7 +184,7 @@
dummyy_loc(INDEX_IJK) = displ_inner_core(2,iglob)
dummyz_loc(INDEX_IJK) = displ_inner_core(3,iglob)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! subroutines adapted from Deville, Fischer and Mund, High-order methods
! for incompressible fluid flow, Cambridge University Press (2002),
@@ -566,7 +566,7 @@
tempy3(INDEX_IJK) = jacobianl * (sigma_xy*gammaxl + sigma_yy*gammayl + sigma_zy*gammazl) ! this goes to accel_y
tempz3(INDEX_IJK) = jacobianl * (sigma_xz*gammaxl + sigma_yz*gammayl + sigma_zz*gammazl) ! this goes to accel_z
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! subroutines adapted from Deville, Fischer and Mund, High-order methods
! for incompressible fluid flow, Cambridge University Press (2002),
@@ -659,7 +659,7 @@
sum_terms(INDEX_IJK,2) = - (fac1*newtempy1(INDEX_IJK) + fac2*newtempy2(INDEX_IJK) + fac3*newtempy3(INDEX_IJK))
sum_terms(INDEX_IJK,3) = - (fac1*newtempz1(INDEX_IJK) + fac2*newtempz2(INDEX_IJK) + fac3*newtempz3(INDEX_IJK))
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! adds gravity
if(GRAVITY_VAL) then
diff --git a/src/specfem3D/compute_forces_outer_core_Dev.F90 b/src/specfem3D/compute_forces_outer_core_Dev.F90
index 870c8ea..0a62a09 100644
--- a/src/specfem3D/compute_forces_outer_core_Dev.F90
+++ b/src/specfem3D/compute_forces_outer_core_Dev.F90
@@ -26,7 +26,7 @@
!=====================================================================
! we switch between vectorized and non-vectorized version by using pre-processor flag FORCE_VECTORIZATION
-! and macros INDEX_IJK, DO_LOOP_IJK, enddo_LOOP_IJK defined in config.fh
+! and macros INDEX_IJK, DO_LOOP_IJK, ENDDO_LOOP_IJK defined in config.fh
#include "config.fh"
@@ -180,7 +180,7 @@
temp_gzl(INDEX_IJK) = cos_theta
endif
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! subroutines adapted from Deville, Fischer and Mund, High-order methods
! for incompressible fluid flow, Cambridge University Press (2002),
@@ -331,7 +331,7 @@
tempx3(INDEX_IJK) = jacobianl*(gammaxl*dpotentialdx_with_rot &
+ gammayl*dpotentialdy_with_rot + gammazl*dpotentialdzl)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! subroutines adapted from Deville, Fischer and Mund, High-order methods
! for incompressible fluid flow, Cambridge University Press (2002),
@@ -352,7 +352,7 @@
+ wgllwgll_xz_3D(INDEX_IJK)*newtempx2(INDEX_IJK) &
+ wgllwgll_xy_3D(INDEX_IJK)*newtempx3(INDEX_IJK))
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
! adds gravity
if(GRAVITY_VAL) then
@@ -361,7 +361,7 @@
sum_terms(INDEX_IJK) = sum_terms(INDEX_IJK) + gravity_term(INDEX_IJK)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
@@ -411,7 +411,7 @@
B_array_rotation(INDEX_IJK,ispec) = B_array_rotation(INDEX_IJK,ispec) &
+ BETA_LDDRK(istage) * B_array_rotation_lddrk(INDEX_IJK,ispec)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
else
@@ -420,7 +420,7 @@
A_array_rotation(INDEX_IJK,ispec) = A_array_rotation(INDEX_IJK,ispec) + source_euler_A(INDEX_IJK)
B_array_rotation(INDEX_IJK,ispec) = B_array_rotation(INDEX_IJK,ispec) + source_euler_B(INDEX_IJK)
- enddo_LOOP_IJK
+ ENDDO_LOOP_IJK
endif
endif
More information about the CIG-COMMITS
mailing list