Changeset 73

Timestamp:

2004-04-22T14:24:13+02:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX047 : Bug correction in mpp case, initialization to zero of rnfdta and zcoefr arrays

File:

• trunk/NEMO/OPA_SRC/SBC/flxrnf.F90 (modified) (11 diffs)

trunk/NEMO/OPA_SRC/SBC/flxrnf.F90

@@ -28 +28 @@
 
    !! * Routine accessibility
-   PUBLIC flx_rnf          ! routine call by step.F90
+   PUBLIC flx_rnf          ! routine call in step module
 
    !! * Shared module variables
@@ -38 +38 @@
       upsrnfz              !: mixed adv scheme in runoffs vicinity (vert.)
    INTEGER, PUBLIC ::   &  !:
-      numrof  = 48 ,    &  !: logical unit for runoff data
       nrunoff =  0 ,    &  !: runoff option (namelist)
       nrnf1, nrnf2         !: first and second record used
@@ -109 +108 @@
       INTEGER, DIMENSION(jpmois) ::     &
          istep                             ! temporary workspace
-      REAL(wp) ::   zdate0                 ! temporary scalars
+      REAL(wp) ::   zdate0, zdt            ! temporary scalars
       REAL(wp), DIMENSION(jpk) ::       &
          zlev                              ! temporary workspace
@@ -138 +137 @@
          CASE DEFAULT
             IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*)' Error nrunoff = ', nrunoff, ' /= 0, 1 or 2'
+            IF(lwp) WRITE(numout,*) ' Error nrunoff = ', nrunoff, ' /= 0, 1 or 2'
             nstop = nstop + 1
 
@@ -178 +177 @@
          ipj = jpjglo
          ipk = jpk
+         zdt = rdt
          
          ! Open file
@@ -183 +183 @@
          IF( kt == nit000 ) THEN
             CALL flinopen( clname, mig(1), nlci, mjg(1), nlcj,    &
-                           .false., ipi, ipj, ipk, zlon,        &
-                           zlat, zlev, jpmois, istep, zdate0,   &
-                           rdt, numrof )
+               &           .false., ipi, ipj, ipk, zlon,        &
+               &           zlat, zlev, jpmois, istep, zdate0,   &
+               &           zdt, numrnf )
             !   Title, dimensions and tests
 # if ! defined key_coupled
@@ -194 +194 @@
                nstop = nstop + 1
             ENDIF
-            IF(lwp) WRITE(numout,*) iman, istep, zdate0, rdt, numrof
-            IF(lwp) WRITE(numout,*) 'numrof=', numrof
+            IF(lwp) WRITE(numout,*) iman, istep, zdate0, rdt, numrnf
+            IF(lwp) WRITE(numout,*) 'numrnf=', numrnf
             IF(lwp) WRITE(numout,*) 'jpmois=', jpmois
-            IF(lwp) WRITE(numout,*) 'rdt=', rdt
+            IF(lwp) WRITE(numout,*) 'zdt=', zdt
 # endif
             IF(ipi /= jpidta .AND. ipj /= jpjdta .AND. ipk /= 1) THEN
@@ -240 +240 @@
             
             ! Read monthly runoff data in kg/m2/s
-
-            CALL flinget(numrof,'sorunoff',jpidta,jpjdta,1,jpmois   &
-                  ,nrnf1,nrnf1,mig(1),nlci,mjg(1),nlcj,rnfdta(1:nlci,1:nlcj,1))
-            CALL flinget(numrof,'sorunoff',jpidta,jpjdta,1,jpmois   &
-                  ,nrnf2,nrnf2,mig(1),nlci,mjg(1),nlcj,rnfdta(1:nlci,1:nlcj,2))
+!ibug
+            IF( kt == nit000 )   rnfdta(:,:,:) = 0.e0
+!ibug
+            CALL flinget( numrnf, 'sorunoff', jpidta, jpjdta, 1, jpmois   &
+               &        , nrnf1, nrnf1, mig(1), nlci, mjg(1), nlcj, rnfdta(1:nlci,1:nlcj,1) )
+            CALL flinget( numrnf, 'sorunoff', jpidta, jpjdta, 1, jpmois   &
+               &        , nrnf2, nrnf2, mig(1), nlci, mjg(1), nlcj, rnfdta(1:nlci,1:nlcj,2) )
 
             IF(lwp) WRITE(numout,*)
@@ -257 +259 @@
          zxy = FLOAT( nday + idmeom - idbd * i15 ) / idbd
 
-         runoff(:,:) = -( (1.-zxy)*rnfdta(:,:,1) + zxy*rnfdta(:,:,2) )
+         runoff(:,:) = -( ( 1.e0 - zxy ) * rnfdta(:,:,1) + zxy * rnfdta(:,:,2) )
 
          ! Runoff reduction
          DO jj = 1, jpj
             DO ji = 1, jpi
-               IF( gphit(ji,jj) > 40 .AND. gphit(ji,jj) < 65 ) THEN
-                  runoff(ji,jj) = 0.85 * runoff(ji,jj)
-               ENDIF
+               IF( gphit(ji,jj) > 40 .AND. gphit(ji,jj) < 65 )   runoff(ji,jj) = 0.85 * runoff(ji,jj)
             END DO
          END DO
@@ -284 +284 @@
          !  coefr * upstream + (1- coefr) centered
          !  coefr must be between 0 and 1.
-
-         CALL flinget(numrof,'socoefr',jpidta,jpjdta,1,jpmois,nrnf1   &
-                     ,nrnf1,mig(1),nlci,mjg(1),nlcj,zcoefr(1:nlci,1:nlcj))
+!ibug
+         zcoefr(:,:) = 0.e0
+!ibug
+
+         CALL flinget( numrnf, 'socoefr', jpidta, jpjdta, 1, jpmois, nrnf1,   &
+            &          nrnf1, mig(1), nlci, mjg(1), nlcj, zcoefr(1:nlci,1:nlcj) )
 
          IF(lwp) WRITE(numout,*)
@@ -362 +365 @@
       ! --------------------
 
-      IF( kt == nitend .AND. nrunoff >= 1 )   CALL flinclo( numrof )
+      IF( kt == nitend .AND. nrunoff >= 1 )   CALL flinclo( numrnf )
 
    END SUBROUTINE flx_rnf