Changeset 14784 for NEMO

Timestamp:

2021-05-04T21:08:42+02:00 (3 years ago)

Author:

techene

Message:

#2605 : enable diahsb and fix rnf forcing accordingly

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE

Files:

• DIA/diahsb.F90 (modified) (1 diff)
• TRA/trasbc.F90 (modified) (2 diffs)
• stprk3.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DIA/diahsb.F90

@@ -95 +95 @@
       z_frc_trd_v = r1_rho0 * glob_sum( 'diahsb', - ( emp(:,:) - rnf(:,:) + fwfisf_cav(:,:) + fwfisf_par(:,:) ) * surf(:,:) )   ! volume fluxes
 #if defined key_RK3
-      CALL ctl_stop( 'dia_hsb: not yet instrumented for RK3' )
+!!st
+      z_frc_trd_t =           glob_sum( 'diahsb', sbc_tsc(:,:,jp_tem) * surf(:,:) )                       ! heat fluxes
+      z_frc_trd_s =           glob_sum( 'diahsb', sbc_tsc(:,:,jp_sal) * surf(:,:) )                       ! salt fluxes
+!!st      CALL ctl_stop( 'dia_hsb: not yet instrumented for RK3' )
 #else
       z_frc_trd_t =           glob_sum( 'diahsb', sbc_tsc(:,:,jp_tem) * surf(:,:) )                       ! heat fluxes

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/trasbc.F90

@@ -182 +182 @@
          DO_2D( 0, 0, 0, 0 )
             IF( rnf(ji,jj) /= 0._wp ) THEN
+!!st - Jerome               zdep = zfact / h_rnf(ji,jj)
+#if defined key_RK3
+               zdep = 1._wp / h_rnf(ji,jj)
+               DO jk = 1, nk_rnf(ji,jj)
+                                     pts(ji,jj,jk,jp_tem,Krhs) = pts(ji,jj,jk,jp_tem,Krhs)  + rnf_tsc(ji,jj,jp_tem) * zdep
+                  IF( ln_rnf_sal )   pts(ji,jj,jk,jp_sal,Krhs) = pts(ji,jj,jk,jp_sal,Krhs)  + rnf_tsc(ji,jj,jp_sal) * zdep
+               END DO
+
+#else
                zdep = zfact / h_rnf(ji,jj)
                DO jk = 1, nk_rnf(ji,jj)
@@ -189 +198 @@
                                         &                      +  ( rnf_tsc_b(ji,jj,jp_sal) + rnf_tsc(ji,jj,jp_sal) ) * zdep
                END DO
+#endif
+!!st
             ENDIF
          END_2D

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3.F90

@@ -224 +224 @@
 !      IF( ln_floats  )   CALL flo_stp   ( kstp, Nbb, Nnn )      ! drifting Floats
 !      IF( ln_diahsb  )   CALL dia_hsb   ( kstp, Nbb, Nnn )  ! - ML - global conservation diagnostics
-
+!!st
+      IF( ln_diahsb  )   CALL dia_hsb   ( kstp, Nbb, Nbb )  ! - ML - global conservation diagnostics
+!!st
+      
 !!gm : This does not only concern the dynamics ==>>> add a new title
 !!gm2: why ouput restart before AGRIF update?