Changeset 2292 for branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

Timestamp:

2010-10-19T12:15:40+02:00 (14 years ago)

Author:

smasson

Message:

update DEV_r1879_FCM for additional tests...

File:

• branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) (4 diffs)

branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

@@ -27 +27 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE sbc_oce         ! Surface boundary condition: ocean fields
+   USE sbc_oce         ! surface boundary condition: ocean fields
+   USE sbcdcy          ! surface boundary condition: diurnal cycle on qsr
    USE phycst          ! physical constants
    USE fldread         ! read input fields
@@ -114 +115 @@
          REWIND ( numnam )               ! ... read in namlist namflx
          READ   ( numnam, namsbc_flx ) 
-
-         ! store namelist information in an array
+         !
+         !                                         ! check: do we plan to use ln_dm2dc with non-daily forcing?
+         IF( ln_dm2dc .AND. sn_qsr%nfreqh /= 24 )   &
+            &   CALL ctl_stop( 'sbc_blk_core: ln_dm2dc can be activated only with daily short-wave forcing' ) 
+         !
+         !                                         ! store namelist information in an array
          slf_i(jp_utau) = sn_utau   ;   slf_i(jp_vtau) = sn_vtau
          slf_i(jp_qtot) = sn_qtot   ;   slf_i(jp_qsr ) = sn_qsr 
@@ -141 +146 @@
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
          !
+         IF( ln_dm2dc ) THEN   ;   qsr(:,:) = sbc_dcy( sf(jp_qsr)%fnow(:,:) )   ! modify now Qsr to include the diurnal cycle
+         ELSE                  ;   qsr(:,:) =          sf(jp_qsr)%fnow(:,:)
+         ENDIF
          ! set the ocean fluxes from read fields
 !CDIR COLLAPSE
@@ -148 +156 @@
                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)
                emp (ji,jj) = sf(jp_emp )%fnow(ji,jj)
             END DO