Changeset 287

Timestamp:

2005-09-22T12:42:24+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_004 : CT : - use the iman variable instead of the parameter jpmois as argument of the flinopen routine when opening the runoff_1m_nomask.nc runoff file

• runoff reduction for the ORCA2_LIM configuration only

File:

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

trunk/NEMO/OPA_SRC/SBC/flxrnf.F90

@@ -160 +160 @@
 
          ! year, month, day
-
-         iman  = jpmois
          i15   = nday / 16
          imois = nmonth + i15 - 1
-         IF( imois == 0 )   imois = iman
+         IF( imois == 0 )   imois = jpmois
          ! Number of days in the month
          IF( nleapy == 1 .AND. MOD( nyear, 4 ) == 0 ) THEN
@@ -184 +182 @@
 
          IF( kt == nit000 ) THEN
+            iman = jpmois
             CALL flinopen( clname, mig(1), nlci, mjg(1), nlcj,    &
                &           .false., ipi, ipj, ipk, zlon,        &
-               &           zlat, zlev, jpmois, istep, zdate0,   &
+               &           zlat, zlev, iman, istep, zdate0,   &
                &           zdt, numrnf )
             !   Title, dimensions and tests
@@ -263 +262 @@
          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 )   runoff(ji,jj) = 0.85 * runoff(ji,jj)
+         ! Runoff reduction only associated to the ORCA2_LIM configuration
+         ! when reading the NetCDF file runoff_1m_nomask.nc
+         IF( cp_cfg == 'orca' .AND. jp_cfg == 2 )   THEN
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  IF( gphit(ji,jj) > 40 .AND. gphit(ji,jj) < 65 )   runoff(ji,jj) = 0.85 * runoff(ji,jj)
+               END DO
             END DO
-         END DO
+         ENDIF
          
 # endif