Changeset 15574 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfpar.F90

Timestamp:

2021-12-03T20:32:50+01:00 (3 years ago)

Author:

techene

Message:

#2605 #2715 trunk merged into dev_r14318_RK3_stage1

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1

Files:

• . (modified) (1 prop)
• src/OCE/ISF/isfpar.F90 (modified) (8 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfpar.F90

@@ -9 +9 @@
    !!            3.4  !  2013-03  (P. Mathiot) Merging + parametrization
    !!            4.1  !  2019-09  (P. Mathiot) Restructuration
+   !!            4.2  !  2021-05  (C. Ethe   ) Test and fix oasis case
    !!----------------------------------------------------------------------
 
@@ -29 +30 @@
    USE iom            ! I/O library
    USE fldread        ! read input field at current time step
-   USE lbclnk         ! lbc_lnk
 
    IMPLICIT NONE
@@ -36 +36 @@
    PUBLIC   isf_par, isf_par_init
 
+   !! * Substitutions   
+#  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -56 +58 @@
       !!              the name tbl was kept.
       !!
+      !! ** Convention : all fluxes are from isf to oce
+      !!
       !!---------------------------------------------------------------------
       !!-------------------------- OUT --------------------------------------
@@ -64 +68 @@
       INTEGER, INTENT(in) ::   Kmm                                    ! ocean time level index
       !!---------------------------------------------------------------------
+      INTEGER ::   ji, jj
       REAL(wp), DIMENSION(jpi,jpj) :: zqoce, zqhc, zqlat, zqh
       !!---------------------------------------------------------------------
@@ -70 +75 @@
       CALL isfpar_mlt( kt, Kmm, zqhc, zqoce, pqfwf  )
       !
-      ! compute heat and water flux ( > 0 out )
-      pqfwf(:,:) = pqfwf(:,:) * mskisf_par(:,:)
-      zqoce(:,:) = zqoce(:,:) * mskisf_par(:,:)
-      zqhc (:,:) = zqhc(:,:)  * mskisf_par(:,:)
-      !
-      ! compute heat content flux ( > 0 out )
-      zqlat(:,:) = pqfwf(:,:) * rLfusisf    ! 2d latent heat flux (W/m2)
-      !
-      ! total heat flux ( > 0 out )
-      zqh(:,:) = ( zqhc (:,:) + zqoce(:,:) )
-      !
-      ! lbclnk on melt and heat fluxes
-      CALL lbc_lnk_multi( 'isfmlt', zqh, 'T', 1.0_wp, pqfwf, 'T', 1.0_wp)
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+         ! compute heat and water flux (from isf to oce)
+         pqfwf(ji,jj) = pqfwf(ji,jj) * mskisf_par(ji,jj)
+         zqoce(ji,jj) = zqoce(ji,jj) * mskisf_par(ji,jj)
+         zqhc (ji,jj) = zqhc(ji,jj)  * mskisf_par(ji,jj)
+         !
+         ! compute latent heat flux (from isf to oce)
+         zqlat(ji,jj) = - pqfwf(ji,jj) * rLfusisf    ! 2d latent heat flux (W/m2)
+         !
+         ! total heat flux (from isf to oce)
+         zqh(ji,jj) = ( zqhc (ji,jj) + zqoce(ji,jj) )
+         !
+         ! set temperature content
+         ptsc(ji,jj,jp_tem) = zqh(ji,jj) * r1_rho0_rcp
+      END_2D
       !
       ! output fluxes
       CALL isf_diags_flx( Kmm, misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par, 'par', pqfwf, zqoce, zqlat, zqhc)
-      !
-      ! set temperature content
-      ptsc(:,:,jp_tem) = zqh(:,:) * r1_rho0_rcp
       !
       ! write restart variables (qoceisf, qhcisf, fwfisf for now and before)
@@ -94 +98 @@
       !
       IF ( ln_isfdebug ) THEN
+         IF(lwp) WRITE(numout,*)
          CALL debug('isf_par: ptsc T',ptsc(:,:,1))
          CALL debug('isf_par: ptsc S',ptsc(:,:,2))
          CALL debug('isf_par: pqfwf fwf',pqfwf(:,:))
+         IF(lwp) WRITE(numout,*)
       END IF
       !
@@ -175 +181 @@
       CASE ( 'oasis' )
          !
+         ALLOCATE( sf_isfpar_fwf(1), STAT=ierr )
+         ALLOCATE( sf_isfpar_fwf(1)%fnow(jpi,jpj,1), sf_isfpar_fwf(1)%fdta(jpi,jpj,1,2) )
+         CALL fld_fill( sf_isfpar_fwf, (/ sn_isfpar_fwf /), cn_isfdir, 'isf_par_init', 'read fresh water flux isf data', 'namisf' )
+         !
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '      ==>>>    isf melt provided by OASIS (cn_isfmlt_par = oasis)'

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+