Changeset 15613 for NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC

Timestamp:

2021-12-22T10:35:54+01:00 (3 years ago)

Author:

cetlod

Message:

r4.0-HEAD : bugfix to better manage the diurnal cycle in TOP, see ticket #2739

Location:

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC

Files:

• sbcblk.F90 (modified) (2 diffs)
• sbccpl.F90 (modified) (1 diff)
• sbcflx.F90 (modified) (2 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcblk.F90

@@ -40 +40 @@
    USE fldread        ! read input fields
    USE sbc_oce        ! Surface boundary condition: ocean fields
+   USE trc_oce         ! share SMS/Ocean variables
    USE cyclone        ! Cyclone 10m wind form trac of cyclone centres
    USE sbcdcy         ! surface boundary condition: diurnal cycle
@@ -441 +442 @@
       ELSE                  ;   qsr(:,:) = zztmp *          sf(jp_qsr)%fnow(:,:,1)   * tmask(:,:,1)
       ENDIF
+
+#if defined key_top
+      IF( ln_trcdc2dm )  THEN      !  diurnal cycle in TOP
+         IF( ln_dm2dc )  THEN  ;  qsr_mean(:,:) = zztmp * sf(jp_qsr)%fnow(:,:,1)  * tmask(:,:,1)
+         ELSE                  ;  ncpl_qsr_freq = sf(jp_qsr)%freqh * 3600 !   qsr_mean will be computed in TOP
+         ENDIF
+      ENDIF
+#endif
 
       zqlw(:,:) = (  sf(jp_qlw)%fnow(:,:,1) - Stef * zst(:,:)*zst(:,:)*zst(:,:)*zst(:,:)  ) * tmask(:,:,1)   ! Long  Wave

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbccpl.F90

@@ -1153 +1153 @@
          IF( ln_dm2dc .AND. ncpl_qsr_freq /= 86400 )   &
             &   CALL ctl_stop( 'sbc_cpl_rcv: diurnal cycle reconstruction (ln_dm2dc) needs daily couping for solar radiation' )
-         ncpl_qsr_freq = 86400 / ncpl_qsr_freq   ! used by top
       ENDIF
       !

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcflx.F90

@@ -15 +15 @@
    USE dom_oce         ! ocean space and time domain
    USE sbc_oce         ! surface boundary condition: ocean fields
+   USE trc_oce         ! share SMS/Ocean variables
    USE sbcdcy          ! surface boundary condition: diurnal cycle on qsr
    USE phycst          ! physical constants
@@ -132 +133 @@
          ELSE                  ;   qsr(:,:) =          sf(jp_qsr)%fnow(:,:,1)   * tmask(:,:,1)
          ENDIF
+#if defined key_top
+      IF( ln_trcdc2dm )  THEN      !  diurnal cycle in TOP
+         IF( ln_dm2dc )  THEN  ;  qsr_mean(:,:) = sf(jp_qsr)%fnow(:,:,1)  * tmask(:,:,1)
+         ELSE                  ;  ncpl_qsr_freq = sf(jp_qsr)%freqh * 3600 !  qsr_mean will be computed in TOP
+         ENDIF
+      ENDIF
+#endif         
          DO jj = 1, jpj                                           ! set the ocean fluxes from read fields
             DO ji = 1, jpi