--- trunk/libf/phylmd/Orography/grid_noro_m.f90	2009/12/14 15:25:16	23
+++ 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
 
@@ -410,23 +409,23 @@
     integer, PARAMETER:: ISMo=300, JSMo=200
     real XF(ISMo, JSMo)
     real WEIGHTpb(-1:1, -1:1)
-    real sum
+    real my_sum
     integer i, is, js, j
 
     if(imar>ismo) stop 'surdimensionner ismo dans mva9 (grid_noro)'
     if(jmar>jsmo) stop 'surdimensionner jsmo dans mva9 (grid_noro)'
 
-    SUM=0.
+    MY_SUM=0.
     DO IS=-1, 1
        DO JS=-1, 1
           WEIGHTpb(IS, JS)=1./FLOAT((1+IS**2)*(1+JS**2))
-          SUM=SUM+WEIGHTpb(IS, JS)
+          MY_SUM=MY_SUM+WEIGHTpb(IS, JS)
        ENDDO
     ENDDO
 
     DO IS=-1, 1
        DO JS=-1, 1
-          WEIGHTpb(IS, JS)=WEIGHTpb(IS, JS)/SUM
+          WEIGHTpb(IS, JS)=WEIGHTpb(IS, JS)/MY_SUM
        ENDDO
     ENDDO