--- trunk/libf/phylmd/Orography/grid_noro_m.f90	2010/03/25 14:29:07	27
+++ trunk/libf/phylmd/Orography/grid_noro_m.f90	2011/02/22 13:49:36	40
@@ -41,8 +41,7 @@
     !           (d)
 
     use dimens_m, only: iim, jjm
-    use comconst, only: pi
-    use numer_rec, only: assert
+    use nr_util, only: assert, pi
 
     REAL, intent(in):: xdata(:), ydata(:) ! coordinates of input field
     REAL, intent(in):: zdata(:, :) ! input field
@@ -255,7 +254,7 @@
           zxtzy(ii, jj)=zxtzy(ii, jj)/weight(ii, jj)
           ztz(ii, jj)  =ztz(ii, jj)/weight(ii, jj)
           !  Standard deviation:
-          zstd(ii, jj)=sqrt(AMAX1(0., ztz(ii, jj)-zmea(ii, jj)**2))
+          zstd(ii, jj)=sqrt(MAX(0., ztz(ii, jj) - zmea(ii, jj)**2))
        ENDDO
     ENDDO