Changeset 10106 for NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2018-09-07T15:53:19+02:00 (6 years ago)

Author:

cbricaud

Message:

add mikt coarsening in nemo3.6 coarsening branch

File:

• NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -460 +460 @@
                   ztc_f  = ztc_n  + atfp * ztc_d
                   !
-                  IF( jk == 1 ) THEN           ! first level 
-                     ze3t_f = ze3t_f - zfact2 * ( emp_b_crs(ji,jj) - emp_crs(ji,jj) + rnf_crs(ji,jj) - rnf_b_crs(ji,jj) )
+                  IF( jk == mikt_crs(ji,jj) ) THEN           ! first level 
+                     ze3t_f = ze3t_f - zfact2 * ( (emp_b_crs(ji,jj)    - emp_crs(ji,jj)   )  &
+                            &                   - (rnf_b_crs(ji,jj)    - rnf_crs(ji,jj)   )  &
+                            &                   + (fwfisf_b_crs(ji,jj) - fwfisf_crs(ji,jj))  )
                      ztc_f  = ztc_f  - zfact1 * ( psbc_tc(ji,jj,jn) - psbc_tc_b(ji,jj,jn) )
                   ENDIF
-!cbr as it is a subroutine dedicated to crs, TRA options are not necessary
-!cbr                  IF( ll_traqsr .AND. jn == jp_tem .AND. jk <= nksr )   &     ! solar penetration (temperature only)
-!cbr                     &     ztc_f  = ztc_f  - zfact1 * ( qsr_hc(ji,jj,jk) - qsr_hc_b(ji,jj,jk) )
-!cbr
-!cbr                  IF( ll_rnf .AND. jk <= nk_rnf(ji,jj) )   &                  ! river runoffs
-!cbr                     &     ztc_f  = ztc_f  - zfact1 * ( rnf_tsc(ji,jj,jn) - rnf_tsc_b(ji,jj,jn) ) &
-!cbr                     &                              * fse3t_n(ji,jj,jk) / h_rnf(ji,jj)
+
+                  !cbr: not adapted for coarsening for the moment
+                  ! ice shelf
+                  !IF( ll_isf ) THEN
+                  !   ! level fully include in the Losch_2008 ice shelf boundary layer
+                  !   IF ( jk >= misfkt(ji,jj) .AND. jk < misfkb(ji,jj) )                          &
+                  !      ztc_f  = ztc_f  - zfact1 * ( risf_tsc(ji,jj,jn) - risf_tsc_b(ji,jj,jn) )  &
+                  !             &                 * fse3t_n(ji,jj,jk) * r1_hisf_tbl (ji,jj)
+                  !   ! level partially include in Losch_2008 ice shelf boundary layer 
+                  !   IF ( jk == misfkb(ji,jj) )                                                   &
+                  !      ztc_f  = ztc_f  - zfact1 * ( risf_tsc(ji,jj,jn) - risf_tsc_b(ji,jj,jn) )  &
+                  !             &                 * fse3t_n(ji,jj,jk) * r1_hisf_tbl (ji,jj) * ralpha(ji,jj)
+                  !END IF
 
                   ze3t_f = 1.e0 / ze3t_f
@@ -476 +484 @@
                   ptn(ji,jj,jk,jn) = pta(ji,jj,jk,jn)     ! ptn <-- pta
                   !
-                  IF( ll_tra_hpg ) THEN        ! semi-implicit hpg (T & S only)
-                     ze3t_d           = 1.e0   / ( ze3t_n + rbcp * ze3t_d )
-                     pta(ji,jj,jk,jn) = ze3t_d * ( ztc_n  + rbcp * ztc_d  )   ! ta <-- Brown & Campana average
-                  ENDIF
                END DO
             END DO