[cig-commits] [commit] master: Bug fix for mean square evaluation for each mode (1d20f55)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/calypso

On branch  : master
Link       : https://github.com/geodynamics/calypso/compare/d3671756c9a8dc30cd0c89470f2e2f0599bbe718...1d20f55fd74b30f7715f875492f6a7b62f3b6274

>---------------------------------------------------------------

commit 1d20f55fd74b30f7715f875492f6a7b62f3b6274
Author: Hiroaki Matsui <h_kemono at mac.com>
Date:   Mon Jun 2 15:58:04 2014 -0700

    Bug fix for mean square evaluation for each mode


>---------------------------------------------------------------

1d20f55fd74b30f7715f875492f6a7b62f3b6274
 .../SPH_SHELL_src/cal_rms_by_sph_spectr.f90        | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/cal_rms_by_sph_spectr.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/cal_rms_by_sph_spectr.f90
index c136f42..b02b98b 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/cal_rms_by_sph_spectr.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/cal_rms_by_sph_spectr.f90
@@ -84,22 +84,16 @@
       end do
 !$omp end parallel do
 !
-        j = idx_rj_degree_zero
-      if(idx_rj_degree_zero .eq. izero) then
-        do k = 1, nidx_rj(1)
-          rms_sph_dat(j,k,jcomp  ) = zero
-          rms_sph_dat(j,k,jcomp+1) = zero
-          rms_sph_dat(j,k,jcomp+2) = zero
-        end do
-      else
-        do k = 1, nidx_rj(1)
-          idx = idx_rj_degree_zero + (k-1) * nidx_rj(2)
-          rms_sph_dat(j,k,jcomp  ) = (half * d_rj(idx,icomp))**2        &
+      if(idx_rj_degree_zero .eq. izero) return
+!
+      j = idx_rj_degree_zero
+      do k = 1, nidx_rj(1)
+        idx = idx_rj_degree_zero + (k-1) * nidx_rj(2)
+        rms_sph_dat(j,k,jcomp  ) = (half * d_rj(idx,icomp))**2          &
      &                            * a_r_1d_rj_r(k)*a_r_1d_rj_r(k)
-          rms_sph_dat(j,k,jcomp+1) = zero
-          rms_sph_dat(j,k,jcomp+2) = rms_sph_dat(j,k,jcomp  )
-        end do
-      end if
+        rms_sph_dat(j,k,jcomp+1) = zero
+        rms_sph_dat(j,k,jcomp+2) = rms_sph_dat(j,k,jcomp  )
+      end do
 !
       end subroutine cal_rms_each_vector_sph_spec
 !