Changeset 2216

Timestamp:

2010-10-12T13:36:25+02:00 (14 years ago)

Author:

smasson

Message:

diurnal cycle in coupled mode in dev_r2174_DCY, see ticket:730

Location:

branches/dev_r2174_DCY/NEMO/OPA_SRC/SBC

Files:

• sbcblk_core.F90 (modified) (3 diffs)
• sbccpl.F90 (modified) (3 diffs)
• sbcdcy.F90 (modified) (6 diffs)
• sbcflx.F90 (modified) (1 diff)
• sbcmod.F90 (modified) (2 diffs)

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

@@ -183 +183 @@
 #endif
       !                                                        ! surface ocean fluxes computed with CLIO bulk formulea
-      IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce_core( kt, sf, sst_m, ssu_m, ssv_m )
+      IF( MOD( kt - 1, nn_fsbc ) == 0 )   CALL blk_oce_core( sf, sst_m, ssu_m, ssv_m )
       !
    END SUBROUTINE sbc_blk_core
    
    
-   SUBROUTINE blk_oce_core( kt, sf, pst, pu, pv )
+   SUBROUTINE blk_oce_core( sf, pst, pu, pv )
       !!---------------------------------------------------------------------
       !!                     ***  ROUTINE blk_core  ***
@@ -209 +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]
@@ -263 +262 @@
       ! ----------------------------------------------------------------------------- !
     
-      IF( ln_dm2dc ) THEN   ;   qsr(:,:) = sbc_dcy( kt, sf(jp_qsr)%fnow )   ! modify now Qsr to include the diurnal cycle
+      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

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

@@ -23 +23 @@
    USE sbc_oce         ! Surface boundary condition: ocean fields
    USE sbc_ice         ! Surface boundary condition: ice fields
+   USE sbcdcy          ! surface boundary condition: diurnal cycle
    USE phycst          ! physical constants
 #if defined key_lim3
@@ -728 +729 @@
          IF( srcv(jpr_qsroce)%laction )   qsr(:,:) = frcv(:,:,jpr_qsroce) 
          IF( srcv(jpr_qsrmix)%laction )   qsr(:,:) = frcv(:,:,jpr_qsrmix)
+         IF( ln_dm2dc )   qsr(:,:) = sbc_dcy( qsr )                           ! modify qsr to include the diurnal cycle
          !
          !                                                       ! total freshwater fluxes over the ocean (emp, emps)
@@ -1159 +1161 @@
             &                     + palbi         (:,:,1) * zicefr(:,:,1) ) )
       END SELECT
+      IF( ln_dm2dc ) THEN   ! modify qsr to include the diurnal cycle
+         pqsr_tot(:,:  ) = sbc_dcy( pqsr_tot(:,:  ) )
+         pqsr_ice(:,:,1) = sbc_dcy( pqsr_ice(:,:,1) )
+      ENDIF
 
       SELECT CASE( TRIM( cn_rcv_dqnsdt ) )

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

@@ -21 +21 @@
    IMPLICIT NONE
    PRIVATE
-   INTEGER                      ::   nday_qsr                    ! day when parameters were computed
+   INTEGER, PUBLIC              ::   nday_qsr                    ! day when parameters were computed
    REAL(wp), DIMENSION(jpi,jpj) ::   raa , rbb  , rcc  , rab     ! parameters used to compute the diurnal cycle
    REAL(wp), DIMENSION(jpi,jpj) ::   rtmd, rdawn, rdusk, rscal   !     -       -         -           -      -
@@ -34 +34 @@
 CONTAINS
 
-      FUNCTION sbc_dcy( kt, pqsrin ) RESULT( zqsrout )
+      FUNCTION sbc_dcy( pqsrin ) RESULT( zqsrout )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE sbc_dcy  ***
@@ -48 +48 @@
       !!              Part 1: a diurnally forced OGCM. Climate Dynamics 29:6, 575-590.
       !!----------------------------------------------------------------------
-      INTEGER,                      INTENT(in   ) ::   kt        ! ocean time-step index
       REAL(wp), DIMENSION(jpi,jpj), INTENT(in   ) ::   pqsrin    ! input daily QSR flux 
       !!
@@ -75 +74 @@
 
       !                                          
-      IF( kt == nit000 ) THEN       ! first time step only               
+      IF( nday_qsr == -1 ) THEN       ! first time step only               
          IF(lwp) THEN
             WRITE(numout,*)
@@ -82 +81 @@
             WRITE(numout,*)
          ENDIF
-         nday_qsr = 0
          ! Compute rcc needed to compute the time integral of the diurnal cycle
          rcc(:,:) = zconvrad * glamt(:,:) - rpi
@@ -140 +138 @@
          rdawn(:,:) = MOD((rdawn(:,:) + 1.), 1.)
          rdusk(:,:) = MOD((rdusk(:,:) + 1.), 1.)
-
 
          !     2.2 Compute the scalling function:

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

@@ -126 +126 @@
      
       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
+         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

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

@@ -18 +18 @@
    USE sbc_oce          ! Surface boundary condition: ocean fields
    USE sbc_ice          ! Surface boundary condition: ice fields
+   USE sbcdcy           ! surface boundary condition: diurnal cycle
    USE sbcssm           ! surface boundary condition: sea-surface mean variables
    USE sbcana           ! surface boundary condition: analytical formulation
@@ -133 +134 @@
          &   CALL ctl_stop( 'sea-ice model requires a bulk formulation or coupled configuration' )
       
+      IF( ln_dm2dc )   nday_qsr = -1   ! initialisation flag
+
       IF( ln_dm2dc .AND. .NOT.( ln_flx .OR. ln_blk_core ) )   &
          &   CALL ctl_stop( 'diurnal cycle into qsr field from daily values requires a flux or core-bulk formulation' )