Changing norm2 to norm_2

dmorse · Apr 19, 2016 · 81bdbd9 · 81bdbd9
1 parent 96c7bc4
commit 81bdbd9
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/iterate/iterate_mod.fp.f b/src/iterate/iterate_mod.fp.f
@@ -1152,8 +1152,8 @@ subroutine iterate_AM( &
  dev_2 = 0.0
  omega_2 = 0.0
  do alpha = 1,N_monomer
- dev_2 = dev_2 + norm2(dev(itr,:,alpha))**2.0
- omega_2 = omega_2 + norm2(omega(alpha,2:))**2.0
+ dev_2 = dev_2 + norm_2(dev(itr,:,alpha))**2.0
+ omega_2 = omega_2 + norm_2(omega(alpha,2:))**2.0
  end do
  error = (dev_2/omega_2)**0.5
  
@@ -1301,8 +1301,8 @@ subroutine iterate_AM( &
  end do
  endif
  omega_hist(itr+1,:,alpha) = omega(alpha,2:) 
- dev_2 = dev_2 + norm2(dev(itr+1,:,alpha))**2.0
- omega_2 = omega_2 + norm2(omega(alpha,2:))**2.0
+ dev_2 = dev_2 + norm_2(dev(itr+1,:,alpha))**2.0
+ omega_2 = omega_2 + norm_2(omega(alpha,2:))**2.0
 
  end do
  error = (dev_2/omega_2)**0.5
@@ -1330,8 +1330,8 @@ subroutine iterate_AM( &
  end do
  endif
  omega_hist(N_hist+1,:,alpha) = omega(alpha,2:)
- dev_2 = dev_2 + norm2(dev(N_hist+1,:,alpha))**2.0
- omega_2 = omega_2 + norm2(omega(alpha,2:))**2.0
+ dev_2 = dev_2 + norm_2(dev(N_hist+1,:,alpha))**2.0
+ omega_2 = omega_2 + norm_2(omega(alpha,2:))**2.0
 
  end do
  error = (dev_2/omega_2)**0.5
@@ -1442,8 +1442,8 @@ subroutine iterate_AM( &
  end do
  endif
  omega_hist(3,:,alpha) = omega(alpha,2:)
- dev_2 = dev_2 + norm2(dev(3,:,alpha))**2.0
- omega_2 = omega_2 + norm2(omega(alpha,2:))**2.0
+ dev_2 = dev_2 + norm_2(dev(3,:,alpha))**2.0
+ omega_2 = omega_2 + norm_2(omega(alpha,2:))**2.0
 
  end do
  error = (dev_2/omega_2)**0.5
@@ -1475,8 +1475,8 @@ subroutine iterate_AM( &
  end do
  endif
  omega_hist(N_hist+1,:,alpha) = omega(alpha,2:)
- dev_2 = dev_2 + norm2(dev(N_hist+1,:,alpha))**2.0
- omega_2 = omega_2 + norm2(omega(alpha,2:))**2.0
+ dev_2 = dev_2 + norm_2(dev(N_hist+1,:,alpha))**2.0
+ omega_2 = omega_2 + norm_2(omega(alpha,2:))**2.0
 
  end do
  error = (dev_2/omega_2)**0.5
@@ -1513,17 +1513,17 @@ subroutine iterate_AM( &
 
 contains
 
- function norm2(x)
+ function norm_2(x)
  
  implicit none
  
  intrinsic :: dot_product, sqrt
- real(long) :: norm2
+ real(long) :: norm_2
  real(long), intent(IN) :: x(:)
  
- norm2 = sqrt(dot_product(x,x))
+ norm_2 = sqrt(dot_product(x,x))
  
- end function norm2
+ end function norm_2
  
 
  end subroutine iterate_AM