Changeset 2229

Timestamp:

2010-10-12T16:37:51+02:00 (14 years ago)

Author:

cbricaud

Message:

correct mistakes in sbcrnf.F90

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (3 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -121 +121 @@
 
          IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
-            rnf(:,:)  = rn_rfact * ( sf_rnf(1)%fnow(:,:) )  
+            rnf(:,:)  = rn_rfact * ( sf_rnf(1)%fnow(:,:,1) )  
             !
             z1_rau0 = 1.e0 / rau0
             !                                                              ! set temperature & salinity content of runoffs
             IF( ln_rnf_temp )   THEN                                       ! use runoffs temperature data
-               tsc_rnf(:,:,jp_tem) = ( sf_t_rnf(1)%fnow(:,:) ) * rnf(:,:) * z1_rau0
-               WHERE( sf_t_rnf(1)%fnow(:,:) == -999 )                      ! if missing data value use SST as runoffs temperature  
+               tsc_rnf(:,:,jp_tem) = ( sf_t_rnf(1)%fnow(:,:,1) ) * rnf(:,:) * z1_rau0
+               WHERE( sf_t_rnf(1)%fnow(:,:,1) == -999 )                      ! if missing data value use SST as runoffs temperature  
                    tsc_rnf(:,:,jp_tem) = sst_m(:,:) * rnf(:,:) * z1_rau0
                ENDWHERE
@@ -134 +134 @@
             ENDIF  
             !                                                              ! use runoffs salinity data 
-            IF( ln_rnf_sal ) tsc_rnf(:,:,jp_sal) = ( sf_s_rnf(1)%fnow(:,:) ) * rnf(:,:) * z1_rau0
+            IF( ln_rnf_sal ) tsc_rnf(:,:,jp_sal) = ( sf_s_rnf(1)%fnow(:,:,1) ) * rnf(:,:) * z1_rau0
             !                                                              ! else use S=0 for runoffs (done one for all in the init)
             !
@@ -279 +279 @@
                CALL ctl_stop( 'sbc_rnf_init: unable to allocate sf_t_rnf structure' )   ;   RETURN
             ENDIF
-            ALLOCATE( sf_t_rnf(1)%fnow(jpi,jpj)   )
+            ALLOCATE( sf_t_rnf(1)%fnow(jpi,jpj,1)   )
             IF( sf_t_rnf(1)%ln_tint ) ALLOCATE( sf_t_rnf(1)%fdta(jpi,jpj,1,2) )
             CALL fld_fill (sf_t_rnf, (/ sn_t_rnf /), cn_dir, 'sbc_rnf_init', 'read runoff temperature data', 'namsbc_rnf' )