Changeset 14717 for NEMO/releases/r4.0/r4.0-HEAD/src/OCE/TRA/tradmp.F90

Timestamp:

2021-04-16T11:42:56+02:00 (3 years ago)

Author:

clem

Message:

4.0-HEAD: correctly handle diagnostics of mass, salt and heat budgets (see ticket #2652). And fix Pierre ticket #2642

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/OCE/TRA/tradmp.F90 (modified) (2 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/TRA/tradmp.F90

@@ -99 +99 @@
       IF( ln_timing )   CALL timing_start('tra_dmp')
       !
-      IF( l_trdtra )   THEN                    !* Save ta and sa trends
+      IF( l_trdtra .OR. iom_use('hflx_dmp_cea') .OR. iom_use('sflx_dmp_cea') ) THEN   !* Save ta and sa trends
          ALLOCATE( ztrdts(jpi,jpj,jpk,jpts) ) 
          ztrdts(:,:,:,:) = tsa(:,:,:,:) 
@@ -149 +149 @@
       END SELECT
       !
+      ! outputs
+      IF( iom_use('hflx_dmp_cea') ) &
+         & CALL iom_put('hflx_dmp_cea', SUM( ( tsa(:,:,:,jp_tem) - ztrdts(:,:,:,jp_tem) ) * e3t_n(:,:,:), dim=3 ) * rcp * rau0 ) ! W/m2
+      IF( iom_use('sflx_dmp_cea') ) &
+         & CALL iom_put('sflx_dmp_cea', SUM( ( tsa(:,:,:,jp_sal) - ztrdts(:,:,:,jp_sal) ) * e3t_n(:,:,:), dim=3 ) * rau0 )       ! g/m2/s
+      !
       IF( l_trdtra )   THEN       ! trend diagnostic
          ztrdts(:,:,:,:) = tsa(:,:,:,:) - ztrdts(:,:,:,:)