Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/SBC/sbcmod.F90

Timestamp:

2021-11-28T18:59:49+01:00 (3 years ago)

Author:

gsamson

Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

Files:

• . (modified) (1 prop)
• src/OCE/SBC/sbcmod.F90 (modified) (4 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

@@ -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/ticket2632_r14588_theta_sbcblk/src/OCE/SBC/sbcmod.F90

@@ -380 +380 @@
       REAL(wp) ::     zthscl        ! wd  tanh scale
       REAL(wp), DIMENSION(jpi,jpj) ::  zwdht, zwght  ! wd dep over wd limit, wgt
+      REAL(wp), DIMENSION(jpi,jpj) ::  z2d           ! temporary array used for iom_put
 
       !!---------------------------------------------------------------------
@@ -465 +466 @@
       CALL lbc_lnk( 'sbcmod', taum(:,:), 'T', 1. )
       !
+      IF( ln_icebergs ) THEN  ! save pure stresses (with no ice-ocean stress) for use by icebergs
+         utau_icb(:,:) = utau(:,:) ; vtau_icb(:,:) = vtau(:,:) 
+      ENDIF
+      !
       !                                            !==  Misc. Options  ==!
       !
@@ -475 +480 @@
       END SELECT
 
-      IF( ln_icebergs    )   THEN
-                                     CALL icb_stp( kt, Kmm )           ! compute icebergs
-         ! Icebergs do not melt over the haloes.
-         ! So emp values over the haloes are no more consistent with the inner domain values.
-         ! A lbc_lnk is therefore needed to ensure reproducibility and restartability.
-         ! see ticket #2113 for discussion about this lbc_lnk.
-         IF( .NOT. ln_passive_mode ) CALL lbc_lnk( 'sbcmod', emp, 'T', 1.0_wp ) ! ensure restartability with icebergs
+      IF( ln_icebergs    )   CALL icb_stp( kt, Kmm )              ! compute icebergs
+
+      ! Icebergs do not melt over the haloes.
+      ! So emp values over the haloes are no more consistent with the inner domain values.
+      ! A lbc_lnk is therefore needed to ensure reproducibility and restartability.
+      ! see ticket #2113 for discussion about this lbc_lnk.
+      ! The lbc_lnk is also needed for SI3 with nn_hls > 1 as emp is not yet defined for these points in iceupdate.F90
+      IF( (ln_icebergs .AND. .NOT. ln_passive_mode) .OR. (nn_ice == 2 .AND. nn_hls == 2) ) THEN
+         CALL lbc_lnk( 'sbcmod', emp, 'T', 1.0_wp )
       ENDIF
 
@@ -565 +572 @@
       !                                                ! ---------------------------------------- !
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
-         CALL iom_put( "empmr"  , emp   - rnf )                ! upward water flux
-         CALL iom_put( "empbmr" , emp_b - rnf )                ! before upward water flux ( needed to recalculate the time evolution of ssh in offline )
+         IF( iom_use("empmr") ) THEN
+            DO_2D( 0, 0, 0, 0 )
+               z2d(ji,jj) =  emp(ji,jj) - rnf(ji,jj)
+            END_2D
+            CALL iom_put( "empmr"  , z2d      )                ! upward water flux
+         ENDIF
+         IF( iom_use("empbmr") ) THEN
+            DO_2D( 0, 0, 0, 0 )
+               z2d(ji,jj) =  emp_b(ji,jj) - rnf(ji,jj)
+            END_2D
+            CALL iom_put( "empbmr" , z2d      )                ! before upward water flux ( needed to recalculate the time evolution of ssh in offline )
+         ENDIF
          CALL iom_put( "saltflx", sfx         )                ! downward salt flux (includes virtual salt flux beneath ice in linear free surface case)
          CALL iom_put( "fmmflx" , fmmflx      )                ! Freezing-melting water flux
-         CALL iom_put( "qt"     , qns + qsr   )                ! total heat flux
+         IF( iom_use("qt") ) THEN
+            DO_2D( 0, 0, 0, 0 )
+               z2d(ji,jj) =  qns(ji,jj) + qsr(ji,jj)
+            END_2D
+            CALL iom_put( "qt"  , z2d         )                ! total heat flux
+         ENDIF
          CALL iom_put( "qns"    , qns         )                ! solar heat flux
-         CALL iom_put( "qsr"    ,       qsr   )                ! solar heat flux
+         CALL iom_put( "qsr"    , qsr         )                ! solar heat flux
          IF( nn_ice > 0 .OR. ll_opa )   CALL iom_put( "ice_cover", fr_i )   ! ice fraction
          CALL iom_put( "taum"   , taum        )                ! wind stress module

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