Changeset 10106 for NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS

Timestamp:

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

Author:

cbricaud

Message:

add mikt coarsening in nemo3.6 coarsening branch

Location:

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS

Files:

• crs.F90 (modified) (4 diffs)
• crsdom.F90 (modified) (1 diff)
• crsfld.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crs.F90

@@ -120 +120 @@
       REAL(wp), DIMENSION(:,:),   ALLOCATABLE,SAVE :: ff_crs
       INTEGER,  DIMENSION(:,:),   ALLOCATABLE,SAVE :: mbathy_crs, mbkt_crs, mbku_crs, mbkv_crs
+      INTEGER,  DIMENSION(:,:),   ALLOCATABLE,SAVE :: mikt_crs
 
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE,SAVE :: gdept_0_crs, gdepu_0_crs, gdepv_0_crs, gdepw_0_crs
@@ -169 +170 @@
       REAL(wp), PUBLIC, DIMENSION(:,:)  , ALLOCATABLE :: rnf_crs,rnf_b_crs,h_rnf_crs
       INTEGER , PUBLIC, DIMENSION(:,:)  , ALLOCATABLE :: nk_rnf_crs
+      REAL(wp), PUBLIC, DIMENSION(:,:)  , ALLOCATABLE :: fwfisf_b_crs, fwfisf_crs
       REAL(wp), PUBLIC, DIMENSION(:,:,:), ALLOCATABLE :: trc_i_crs,trc_o_crs
       REAL(wp), PUBLIC, DIMENSION(:,:,:), ALLOCATABLE :: sbc_trc_crs, sbc_trc_b_crs
@@ -284 +286 @@
 
       ALLOCATE( mbathy_crs(jpi_crs,jpj_crs), mbkt_crs(jpi_crs,jpj_crs) , &
-         &      mbku_crs(jpi_crs,jpj_crs)  , mbkv_crs(jpi_crs,jpj_crs) , STAT=ierr(9))
+         &      mbku_crs(jpi_crs,jpj_crs)  , mbkv_crs(jpi_crs,jpj_crs) , & 
+         &      mikt_crs(jpi_crs,jpj_crs)  , STAT=ierr(9))
 
       ALLOCATE( gdept_0_crs(jpi_crs,jpj_crs,jpk), gdepu_0_crs(jpi_crs,jpj_crs,jpk) , &
@@ -310 +313 @@
          &     rnf_crs (jpi_crs,jpj_crs), rnf_b_crs(jpi_crs ,jpj_crs), nk_rnf_crs(jpi_crs ,jpj_crs), h_rnf_crs(jpi_crs ,jpj_crs), &
          &     emp_crs (jpi_crs,jpj_crs), emp_b_crs(jpi_crs,jpj_crs), &
+         &     fwfisf_crs(jpi_crs,jpj_crs), fwfisf_b_crs(jpi_crs,jpj_crs), &
          &     sbc_trc_crs (jpi_crs,jpj_crs,jpts), sbc_trc_b_crs(jpi_crs,jpj_crs,jpts), &
          &     trc_i_crs (jpi_crs,jpj_crs,jpts), trc_o_crs(jpi_crs,jpj_crs,jpts), &

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90

@@ -1736 +1736 @@
    END SUBROUTINE crs_dom_bat
 
+   SUBROUTINE crs_dom_top
+      !!----------------------------------------------------------------
+      !!               *** SUBROUTINE crs_dom_top ***
+      !!
+      !! ** Purpose :  coarsening mikt
+      !!
+      !!----------------------------------------------------------------
+      INTEGER ::  ji, jj, jk
+      INTEGER ::  ijis, ijie, ijjs, ijje
+
+      !!----------------------------------------------------------------
+
+      DO jj  = nldj_crs,nlej_crs
+
+         ijjs = mjs_crs(jj)
+         ijje = mje_crs(jj)
+
+         DO ji = nldi_crs, nlei_crs
+
+            ijis = mis_crs(ji)
+            ijie = mie_crs(ji)
+
+            mikt_crs(ji,jj) = MINVAL( mikt(ijis:ijie,ijjs:ijje) )
+         ENDDO
+      ENDDO
+
+      mikt_crs = MAX( mikt_crs , 1 )
+
+   END SUBROUTINE crs_dom_top
+
    SUBROUTINE PIKSRT(N,ARR)
      INTEGER                  ,INTENT(IN) :: N

NEMO/branches/2018/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90

@@ -156 +156 @@
       CALL crs_dom_ope( rnf_b ,'SUM', 'T', tmask, rnf_b_crs , p_e12=e1e2t, p_surf_crs=e1e2w_msk(:,:,1), psgn=1.0 )
       CALL crs_dom_ope( emp_b ,'SUM', 'T', tmask, emp_b_crs , p_e12=e1e2t, p_surf_crs=e1e2w_msk(:,:,1), psgn=1.0 )
+      CALL crs_dom_ope( fwfisf_b  ,'SUM', 'T', tmask, fwfisf_b_crs  , p_e12=e1e2t, p_surf_crs=e1e2w_msk(:,:,1), psgn=1.0 )
 
       !  Temperature
@@ -303 +304 @@
       CALL crs_dom_ope( emp   ,'SUM', 'T', tmask, emp_crs   , p_e12=e1e2t, p_surf_crs=e1e2w_msk(:,:,1), psgn=1.0 )
       CALL crs_dom_ope( fmmflx,'SUM', 'T', tmask, fmmflx_crs, p_e12=e1e2t, p_surf_crs=e1e2w_msk(:,:,1), psgn=1.0 )
+      CALL crs_dom_ope( fwfisf,'SUM', 'T', tmask, fwfisf_crs   , p_e12=e1e2t, p_surf_crs=e1e2w_msk(:,:,1), psgn=1.0 )
 
       CALL crs_dom_ope( fr_i  ,'SUM', 'T', tmask, fr_i_crs  , p_e12=e1e2t, p_surf_crs=e1e2w_msk(:,:,1), psgn=1.0 )