Changeset 2210 for branches/dev_r2174_DCY/NEMO/OPA_SRC/SBC/sbcblk_core.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/sbcblk_core.F90 (modified) (4 diffs)

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

@@ -177 +177 @@
       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
+      CALL fld_read( kt, nn_fsbc, sf )        ! input fields provided at the current time-step
 
 #if defined key_lim3
@@ -185 +183 @@
 #endif
       !                                                        ! surface ocean fluxes computed with CLIO bulk formulea
-      IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce_core( sf, sst_m, ssu_m, ssv_m )
+      IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce_core( kt, sf, sst_m, ssu_m, ssv_m )
       !
    END SUBROUTINE sbc_blk_core
    
    
-   SUBROUTINE blk_oce_core( sf, pst, pu, pv )
+   SUBROUTINE blk_oce_core( kt, sf, pst, pu, pv )
       !!---------------------------------------------------------------------
       !!                     ***  ROUTINE blk_core  ***
@@ -211 +209 @@
       !!  ** Nota  :   sf has to be a dummy argument for AGRIF on NEC
       !!---------------------------------------------------------------------
+      INTEGER ,  INTENT(in)                     ::   kt   ! ocean time step
       TYPE(fld), INTENT(in), DIMENSION(:)       ::   sf    ! input data
       REAL(wp),  INTENT(in), DIMENSION(jpi,jpj) ::   pst   ! surface temperature                      [Celcius]
@@ -264 +263 @@
       ! ----------------------------------------------------------------------------- !
     
+      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
       ! ocean albedo assumed to be 0.066
-!CDIR COLLAPSE
-      qsr (:,:) = ( 1. - 0.066 ) * sf(jp_qsr)%fnow(:,:) * tmask(:,:,1)                                 ! Short Wave
+      qsr (:,:) = ( 1. - 0.066 ) * qsr(:,:) * tmask(:,:,1)                                                 ! Short Wave
 !CDIR COLLAPSE
       zqlw(:,:) = (  sf(jp_qlw)%fnow(:,:) - Stef * zst(:,:)*zst(:,:)*zst(:,:)*zst(:,:)  ) * tmask(:,:,1)   ! Long  Wave