Changeset 3832

Timestamp:

2013-03-06T17:22:01+01:00 (11 years ago)

Author:

rfurner

Message:

fix to river code, see ticket 1064

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (4 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -95 +95 @@
       INTEGER, INTENT(in) ::   kt          ! ocean time step
       !
-      INTEGER  ::   ji, jj   ! dummy loop indices
+      INTEGER  ::   ji, jj    ! dummy loop indices
+      INTEGER  ::   z_err = 0 ! dummy integer for error handling
       !!----------------------------------------------------------------------
       !
@@ -140 +141 @@
             IF( ln_rnf_sal )   rnf_tsc(:,:,jp_sal) = ( sf_s_rnf(1)%fnow(:,:,1) ) * rnf(:,:) * r1_rau0
             !                                                           ! else use S=0 for runoffs (done one for all in the init)
-            !
-            IF( ln_rnf_tem .OR. ln_rnf_sal ) THEN                 ! runoffs as outflow: use ocean SST and SSS
-               WHERE( rnf(:,:) < 0._wp )                                 ! example baltic model when flow is out of domain
-                  rnf_tsc(:,:,jp_tem) = sst_m(:,:) * rnf(:,:) * r1_rau0
-                  rnf_tsc(:,:,jp_sal) = sss_m(:,:) * rnf(:,:) * r1_rau0
-               END WHERE
-            ENDIF
+            IF ( ANY( rnf(:,:) < 0._wp ) ) z_err=1
+            IF(lk_mpp) CALL mpp_sum(z_err)
+            IF( z_err > 0 ) CALL ctl_stop( 'sbc_rnf : negative runnoff values exist' )
             !
             CALL iom_put( "runoffs", rnf )         ! output runoffs arrays
@@ -338 +335 @@
             IF(lwp) WRITE(numout,*) '          runoffs depth read in a file'
             rn_dep_file = TRIM( cn_dir )//TRIM( sn_dep_rnf%clname )
+            IF( .NOT. sn_dep_rnf%ln_clim ) THEN   ;   WRITE(rn_dep_file, '(a,"_y",i4)' ) TRIM( rn_dep_file ), nyear    ! add year 
+               IF( sn_dep_rnf%cltype == 'monthly' )   WRITE(rn_dep_file, '(a,"m",i2)'  ) TRIM( rn_dep_file ), nmonth   ! add month 
+            ENDIF 
             CALL iom_open ( rn_dep_file, inum )                           ! open file
             CALL iom_get  ( inum, jpdom_data, sn_dep_rnf%clvar, h_rnf )   ! read the river mouth array
@@ -352 +352 @@
                   ELSEIF( h_rnf(ji,jj) == -999._wp ) THEN   ;  nk_rnf(ji,jj) = mbkt(ji,jj)
                   ELSE
-                     CALL ctl_stop( 'runoff depth not positive, and not -999 or -1, rnf value in file fort.999'  )
-                     WRITE(999,*) 'ji, jj, rnf(ji,jj) :', ji, jj, rnf(ji,jj)
+                     CALL ctl_stop( 'sbc_rnf_init: runoff depth not positive, and not -999 or -1, rnf value in file fort.999'  )
+                     WRITE(999,*) 'ji, jj, h_rnf(ji,jj) :', ji, jj, h_rnf(ji,jj)
                   ENDIF
                END DO