Changeset 11822 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trcsbc.F90

Timestamp:

2019-10-29T11:41:36+01:00 (4 years ago)

Author:

acc

Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Sette tested updates to branch to align with trunk changes between 10721 and 11740. Sette tests are passing but results differ from branch before these changes (except for GYRE_PISCES and VORTEX) and branch results already differed from trunk because of algorithmic fixes. Will need more checks to confirm correctness.

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trcsbc.F90 (modified) (5 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trcsbc.F90

@@ -63 +63 @@
       !
       INTEGER  ::   ji, jj, jn                      ! dummy loop indices
-      REAL(wp) ::   zse3t, zrtrn, zratio, zfact     ! local scalars
-      REAL(wp) ::   zftra, zcd, zdtra, ztfx, ztra   !   -      -
+      REAL(wp) ::   zse3t, zrtrn, zfact     ! local scalars
+      REAL(wp) ::   zftra, zdtra, ztfx, ztra   !   -      -
       CHARACTER (len=22) :: charout
       REAL(wp), DIMENSION(jpi,jpj)   ::   zsfx
@@ -115 +115 @@
 
       ! 0. initialization
-      IF( nn_ice_tr == -1 ) THEN    ! No tracers in sea ice (null concentration in sea ice)
+      SELECT CASE ( nn_ice_tr )
+
+      CASE ( -1 ) ! No tracers in sea ice (null concentration in sea ice)
          !
          DO jn = 1, jptra
@@ -125 +127 @@
          END DO
          !
-       ELSE
+      CASE ( 0 )  ! Same concentration in sea ice and in the ocean
+         !
+         DO jn = 1, jptra
+            DO jj = 2, jpj
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  sbc_trc(ji,jj,jn) = ( zsfx(ji,jj) + fmmflx(ji,jj) ) * r1_rau0 * ptr(ji,jj,1,jn,Kmm)
+               END DO
+            END DO
+         END DO
+         !
+      CASE ( 1 )  ! Specific treatment of sea ice fluxes with an imposed concentration in sea ice 
          !
          DO jn = 1, jptra
@@ -133 +145 @@
                   ! tracer flux at the ice/ocean interface (tracer/m2/s)
                   zftra = - trc_i(ji,jj,jn) * fmmflx(ji,jj) ! uptake of tracer in the sea ice
-                  zcd   =   trc_o(ji,jj,jn) * fmmflx(ji,jj) ! concentration dilution due to freezing-melting,
                   !                                         ! only used in the levitating sea ice case
                   ! tracer flux only       : add concentration dilution term in net tracer flux, no F-M in volume flux
                   ! tracer and mass fluxes : no concentration dilution term in net tracer flux, F-M term in volume flux
-                  ztfx  = zftra                             ! net tracer flux
+                  ztfx  = zftra                        ! net tracer flux
                   !
-                  zdtra = r1_rau0 * ( ztfx + zsfx(ji,jj) * ptr(ji,jj,1,jn,Kmm) ) 
+                  zdtra = r1_rau0 * ( ztfx + ( zsfx(ji,jj) + fmmflx(ji,jj) ) * ptr(ji,jj,1,jn,Kmm) ) 
                   IF ( zdtra < 0. ) THEN
-                     zratio = -zdtra * zse3t * r2dttrc / ( ptr(ji,jj,1,jn,Kmm) + zrtrn )
-                     zdtra = MIN(1.0, zratio) * zdtra ! avoid negative concentrations to arise
+                     zdtra  = MAX(zdtra, -ptr(ji,jj,1,jn,Kmm) * e3t(ji,jj,1,Kmm) / r2dttrc )   ! avoid negative concentrations to arise
                   ENDIF
                   sbc_trc(ji,jj,jn) =  zdtra 
@@ -148 +158 @@
             END DO
          END DO
-      ENDIF
+      END SELECT
       !
       CALL lbc_lnk( 'trcsbc', sbc_trc(:,:,:), 'T', 1. )