--- trunk/libf/dyn3d/grid_noro_m.f90	2008/02/27 13:16:39	3
+++ trunk/libf/phylmd/Orography/grid_noro_m.f90	2010/03/25 14:29:07	27
@@ -42,7 +42,7 @@
 
     use dimens_m, only: iim, jjm
     use comconst, only: pi
-    use nrutil, only: assert
+    use numer_rec, only: assert
 
     REAL, intent(in):: xdata(:), ydata(:) ! coordinates of input field
     REAL, intent(in):: zdata(:, :) ! input field
@@ -59,7 +59,7 @@
     REAL, intent(out):: zpic(:, :) ! Maximum altitude
     real, intent(out):: zval(:, :) ! Minimum altitude
 
-    real, intent(out):: mask(:, :)
+    real, intent(out):: mask(:, :) ! fraction of land
 
     ! Variables local to the procedure:
 
@@ -141,7 +141,7 @@
        zusn(i, jusn+2)=zusn(i+iusn/2, jusn+1)
        zusn(i+iusn/2+iext, jusn+2)=zusn(i, jusn+1)
     ENDDO
-    !  
+
     ! COMPUTE LIMITS OF MODEL GRIDPOINT AREA
     !     ( REGULAR GRID)
 
@@ -190,7 +190,7 @@
     ENDDO
 
     !  SUMMATION OVER GRIDPOINT AREA
-    ! 
+
     zleny=pi/real(jusn)*rad
     xincr=pi/2./real(jusn)
     DO ii = 1, iim+1
@@ -324,13 +324,13 @@
           zllmval=AMAX1(zval(ii, jj), zllmval)
        ENDDO
     ENDDO
-    print *, '  MEAN ORO:', zllmmea
-    print *, '  ST. DEV.:', zllmstd
-    print *, '  PENTE:', zllmsig
-    print *, ' ANISOTROP:', zllmgam
-    print *, '  ANGLE:', zminthe, zllmthe
-    print *, '  pic:', zllmpic
-    print *, '  val:', zllmval
+    print *, 'MEAN ORO: ', zllmmea
+    print *, 'ST. DEV.: ', zllmstd
+    print *, 'PENTE: ', zllmsig
+    print *, 'ANISOTROP: ', zllmgam
+    print *, 'ANGLE: ', zminthe, zllmthe
+    print *, 'pic: ', zllmpic
+    print *, 'val: ', zllmval
 
     ! gamma and theta a 1. and 0. at poles
     zmea(iim+1, :)=zmea(1, :)
@@ -410,23 +410,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