Changeset 13151 for NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/OCE/TRA/traisf.F90

Timestamp:

2020-06-24T14:38:26+02:00 (4 years ago)

Author:

gm

Message:

result from merge with qco r12983

File:

• NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/OCE/TRA/traisf.F90 (modified) (9 diffs)

NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/OCE/TRA/traisf.F90

@@ -11 +11 @@
    !!----------------------------------------------------------------------
    USE isf_oce                                     ! Ice shelf variables
-   USE dom_oce , ONLY : e3t, r1_e1e2t            ! ocean space domain variables
+   USE dom_oce                                     ! ocean space domain variables
    USE isfutils, ONLY : debug                      ! debug option
    USE timing  , ONLY : timing_start, timing_stop  ! Timing
@@ -23 +23 @@
    !! * Substitutions
 #  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -33 +34 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_isf  ***
-      !!                   
+      !!
       !! ** Purpose :  Compute the temperature trend due to the ice shelf melting (qhoce + qhc)
       !!
@@ -61 +62 @@
          !
          ! Dynamical stability at start up after change in under ice shelf cavity geometry is achieve by correcting the divergence.
-         ! This is achieved by applying a volume flux in order to keep the horizontal divergence after remapping 
+         ! This is achieved by applying a volume flux in order to keep the horizontal divergence after remapping
          ! the same as at the end of the latest time step. So correction need to be apply at nit000 (euler time step) and
          ! half of it at nit000+1 (leap frog time step).
@@ -89 +90 @@
       !! *** Purpose :  Compute the temperature trend due to the ice shelf melting (qhoce + qhc) for cav or par case
       !!
-      !! *** Action :: Update pts(:,:,:,:,Krhs) with the surface boundary condition trend 
+      !! *** Action :: Update pts(:,:,:,:,Krhs) with the surface boundary condition trend
       !!
       !!----------------------------------------------------------------------
@@ -98 +99 @@
       REAL(wp), DIMENSION(jpi,jpj,jpts), INTENT(in   ) :: ptsc , ptsc_b
       !!----------------------------------------------------------------------
-      INTEGER                      :: ji,jj,jk  ! loop index   
+      INTEGER                      :: ji,jj,jk  ! loop index
       INTEGER                      :: ikt, ikb  ! top and bottom level of the tbl
       REAL(wp), DIMENSION(jpi,jpj) :: ztc       ! total ice shelf tracer trend
@@ -117 +118 @@
          END DO
          !
-         ! level partially include in ice shelf boundary layer 
+         ! level partially include in ice shelf boundary layer
          pts(ji,jj,ikb,jp_tem) = pts(ji,jj,ikb,jp_tem) + ztc(ji,jj) * pfrac(ji,jj)
          !
@@ -128 +129 @@
       !!                  ***  ROUTINE tra_isf_cpl  ***
       !!
-      !! *** Action :: Update pts(:,:,:,:,Krhs) with the ice shelf coupling trend 
+      !! *** Action :: Update pts(:,:,:,:,Krhs) with the ice shelf coupling trend
       !!
       !!----------------------------------------------------------------------
@@ -140 +141 @@
       !
       DO jk = 1,jpk
-         ptsa(:,:,jk,jp_tem) = ptsa(:,:,jk,jp_tem) + ptsc(:,:,jk,jp_tem) * r1_e1e2t(:,:) / e3t(:,:,jk,Kmm)
-         ptsa(:,:,jk,jp_sal) = ptsa(:,:,jk,jp_sal) + ptsc(:,:,jk,jp_sal) * r1_e1e2t(:,:) / e3t(:,:,jk,Kmm)
+         ptsa(:,:,jk,jp_tem) =   &
+            &  ptsa(:,:,jk,jp_tem) + ptsc(:,:,jk,jp_tem) * r1_e1e2t(:,:) / e3t(:,:,jk,Kmm)
+         ptsa(:,:,jk,jp_sal) =   &
+            &  ptsa(:,:,jk,jp_sal) + ptsc(:,:,jk,jp_sal) * r1_e1e2t(:,:) / e3t(:,:,jk,Kmm)
       END DO
       !