Changeset 13888 for NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src

Timestamp:

2020-11-26T16:27:57+01:00 (4 years ago)

Author:

gsamson

Message:

add _wp to constants in zdfmfc.F90 and add missing eos_insitu_pot_2d routine in ISOMIP+ MY_SRC eosbn2.F90 to passe SETTE tests; #2052

Location:

NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/OCE

Files:

• TRA/eosbn2.F90 (modified) (1 diff)
• ZDF/zdfmfc.F90 (modified) (13 diffs)

NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/OCE/TRA/eosbn2.F90

@@ -602 +602 @@
          !
       END SELECT
-      !RBB IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab2d_1=prd, clinfo1=' eos-pot: ', tab2d_2=prhop, clinfo2=' pot : ', kdim=1 )
+      !
+      IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab2d_1=prhop, clinfo1=' eos-pot: ' )
       !
       IF( ln_timing )   CALL timing_stop('eos-pot')

NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/OCE/ZDF/zdfmfc.F90

@@ -158 +158 @@
       ! Initialisation of prognostic variables
       !-------------------------------------------
-      zrwp (:,:,:) =  0. ; zrwp2(:,:,:) =  0. ; zedmf(:,:,:) =  0.
-      zph  (:,:)   =  0. ; zphm1(:,:)   =  0. ; zphpm1(:,:)  =  0.
-      ztsp(:,:,:,:)=  0.
+      zrwp (:,:,:) =  0._wp ; zrwp2(:,:,:) =  0._wp ; zedmf(:,:,:) =  0._wp
+      zph  (:,:)   =  0._wp ; zphm1(:,:)   =  0._wp ; zphpm1(:,:)  =  0._wp
+      ztsp(:,:,:,:)=  0._wp
 
       ! Tracers inside plume (ztsp) and environment (ztse)
@@ -175 +175 @@
       !-------------------------------------------
       zhcmo(:,:) = e3t(:,:,1,Kmm)
-      zfbuo(:,:)   = 0.
+      zfbuo(:,:)   = 0._wp
       WHERE ( ABS(zrautb(:,:)) > 1.e-20 ) zfbuo(:,:)   =   &
          &      grav * ( 2.e-4_wp *zfnet(:,:) - 7.6E-4_wp*pts(:,:,1,jp_sal,Kmm)*zsws(:,:)/zrautb(:,:)) * zhcmo(:,:)
@@ -192 +192 @@
       zrwp(:,:,1)  = zwpsurf(:,:)
       zrwp2(:,:,1) = zwpsurf(:,:)**2
-      zepsT(:,:,:) = 0.001
-      zepsW(:,:,:) = 0.001
+      zepsT(:,:,:) = 0.001_wp
+      zepsW(:,:,:) = 0.001_wp
 
 
@@ -208 +208 @@
          ! Compute the buoyancy acceleration on T-points at jk-1
          zrautbm1(:,:) = zrautb(:,:)
-         !CALL eos( pts (:,:,jk-1,:,Kmm) ,  zrautbm1(:,:) )
          CALL eos( pts (:,:,jk  ,:,Kmm) ,  zrautb(:,:)   )
          CALL eos( ztsp(:,:,jk-1,:    ) ,  zraupl(:,:)   )
@@ -231 +230 @@
 
             ! Non-hydrostatic pressure terms in the wp2 equation
-            zcnh = 0.2 
+            zcnh = 0.2_wp 
             znum = 0.5_wp  + zcnh - &
                    (zcnh*grav*zraupl(ji,jj)/zph(ji,jj)+zcb*zepsW(ji,jj,jk-1)) &
@@ -261 +260 @@
                   IF (zxl .LT. 0._wp) THEN
                      zctre  = -1.*rn_cap*zxl 
-                     zcdet  =  0.
+                     zcdet  =  0._wp
                   ELSE
-                     zctre  =  0.
+                     zctre  =  0._wp
                      zcdet  =  rn_cap*zxl 
                   END IF
@@ -281 +280 @@
             ! Compute Entrainment coefficient
             IF(rn_cemf .GT. 0.) THEN
-               zxw = 0.5*(zrwp(ji,jj,jk-1)+ zrwp(ji,jj,jk) )
-               zepsT(ji,jj,jk)  =  0.01
+               zxw = 0.5_wp*(zrwp(ji,jj,jk-1)+ zrwp(ji,jj,jk) )
+               zepsT(ji,jj,jk)  =  0.01_wp
                IF( zxw > 0.  ) THEN
                   zepsT(ji,jj,jk)  =  zepsT(ji,jj,jk) +                       &
-                                   &  1.*ABS( zrwp(ji,jj,jk-1)-zrwp(ji,jj,jk) )  &
+                                   &  ABS( zrwp(ji,jj,jk-1)-zrwp(ji,jj,jk) )  &
                                    &  / ( e3t(ji,jj,jk-1,Kmm) * zxw )
                   zepsT(ji,jj,jk)  = zepsT(ji,jj,jk) * rn_cemf * wmask(ji,jj,jk)
@@ -303 +302 @@
             ! Compute the plume properties on T-points
             !---------------------------------------------------------------
-            IF(zrwp (ji,jj,jk) .LT. 1.e-12 .AND. zrwp (ji,jj,jk-1) .LT. 1.e-12) THEN
+            IF(zrwp (ji,jj,jk) .LT. 1.e-12_wp .AND. zrwp (ji,jj,jk-1) .LT. 1.e-12_wp) THEN
                ztsp(ji,jj,jk-1,jp_tem) = pts(ji,jj,jk-1,jp_tem,Kmm)
                ztsp(ji,jj,jk-1,jp_sal) = pts(ji,jj,jk-1,jp_sal,Kmm)
@@ -324 +323 @@
       ! Compute Mass Flux on T-point
       DO jk=1,jpk-1
-         edmfm(:,:,jk) = (zedmf(:,:,jk+1)  + zedmf(:,:,jk) )*0.5
+         edmfm(:,:,jk) = (zedmf(:,:,jk+1)  + zedmf(:,:,jk) )*0.5_wp
       END DO
       edmfm(:,:,jpk) = zedmf(:,:,jpk) 
@@ -339 +338 @@
       !  Computation of a tridiagonal matrix and right hand side terms of the linear system
       !=================================================================================
-      edmfa(:,:,:)     = 0.
-      edmfb(:,:,:)     = 0.
-      edmfc(:,:,:)     = 0.  
-      edmftra(:,:,:,:) = 0.
+      edmfa(:,:,:)     = 0._wp
+      edmfb(:,:,:)     = 0._wp
+      edmfc(:,:,:)     = 0._wp
+      edmftra(:,:,:,:) = 0._wp
 
       !---------------------------------------------------------------
@@ -348 +347 @@
       !---------------------------------------------------------------
       DO jk=1,jpk-1
-         edmfa(:,:,jk) =  0.
+         edmfa(:,:,jk) =  0._wp
          edmfb(:,:,jk) = -edmfm(:,:,jk  ) / e3w(:,:,jk+1,Kmm)
          edmfc(:,:,jk) =  edmfm(:,:,jk+1) / e3w(:,:,jk+1,Kmm)
@@ -354 +353 @@
       edmfa(:,:,jpk)   = -edmfm(:,:,jpk-1) / e3w(:,:,jpk,Kmm)
       edmfb(:,:,jpk)   =  edmfm(:,:,jpk  ) / e3w(:,:,jpk,Kmm)
-      edmfc(:,:,jpk)   =  0.
+      edmfc(:,:,jpk)   =  0._wp
 
       !---------------------------------------------------------------
@@ -461 +460 @@
                                      !* allocate edmf arrays
       IF( zdf_mfc_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_edmf_init : unable to allocate arrays' )
-      edmfa(:,:,:)     = 0.
-      edmfb(:,:,:)     = 0.
-      edmfc(:,:,:)     = 0.
-      edmftra(:,:,:,:) = 0.
+      edmfa(:,:,:)     = 0._wp
+      edmfb(:,:,:)     = 0._wp
+      edmfc(:,:,:)     = 0._wp
+      edmftra(:,:,:,:) = 0._wp
       !
    END SUBROUTINE zdf_mfc_init