Changeset 2210 for branches/dev_r2174_DCY/NEMO/OPA_SRC/SBC/sbcflx.F90

Timestamp:

2010-10-12T11:54:28+02:00 (14 years ago)

Author:

smasson

Message:

bugfix on diurnal cycle in dev_r2174_DCY, see ticket:730

File:

• branches/dev_r2174_DCY/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) (2 diffs)

branches/dev_r2174_DCY/NEMO/OPA_SRC/SBC/sbcflx.F90

@@ -123 +123 @@
       ENDIF
 
-                       CALL fld_read( kt, nn_fsbc, sf )       ! input fields provided at the current time-step
-      
-      IF( ln_dm2dc )   CALL sbc_dcy( kt , sf(jp_qsr)%fnow )   ! modify now Qsr to include the diurnal cycle
-
-      IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN                    ! update ocean fluxes at each SBC frequency
+      CALL fld_read( kt, nn_fsbc, sf )                            ! input fields provided at the current time-step
+     
+      IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN                        ! update ocean fluxes at each SBC frequency
+         IF( ln_dm2dc ) THEN   ;   qsr(:,:) = sbc_dcy( kt, sf(jp_qsr)%fnow )   ! modify now Qsr to include the diurnal cycle
+         ELSE                  ;   qsr(:,:) = sf(jp_qsr)%fnow(:,:)
+         ENDIF
 !CDIR COLLAPSE
          DO jj = 1, jpj                                           ! set the ocean fluxes from read fields
@@ -133 +134 @@
                utau(ji,jj) = sf(jp_utau)%fnow(ji,jj)
                vtau(ji,jj) = sf(jp_vtau)%fnow(ji,jj)
-               qns (ji,jj) = sf(jp_qtot)%fnow(ji,jj) - sf(jp_qsr)%fnow(ji,jj)
-               qsr (ji,jj) = sf(jp_qsr )%fnow(ji,jj)
+               qns (ji,jj) = sf(jp_qtot)%fnow(ji,jj) - qsr(ji,jj)
                emp (ji,jj) = sf(jp_emp )%fnow(ji,jj)
             END DO