Changeset 14072 for NEMO/trunk/src/OCE/TRA/eosbn2.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/TRA/eosbn2.F90 (modified) (19 diffs)

NEMO/trunk/src/OCE/TRA/eosbn2.F90

@@ -31 +31 @@
    !!   bn2           : compute the Brunt-Vaisala frequency
    !!   eos_pt_from_ct: compute the potential temperature from the Conservative Temperature
-   !!   eos_rab       : generic interface of in situ thermal/haline expansion ratio 
+   !!   eos_rab       : generic interface of in situ thermal/haline expansion ratio
    !!   eos_rab_3d    : compute in situ thermal/haline expansion ratio
    !!   eos_rab_2d    : compute in situ thermal/haline expansion ratio for 2d fields
@@ -46 +46 @@
    USE in_out_manager ! I/O manager
    USE lib_mpp        ! MPP library
-   USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
+   USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
    USE prtctl         ! Print control
    USE lbclnk         ! ocean lateral boundary conditions
@@ -63 +63 @@
    END INTERFACE
    !
-   INTERFACE eos_fzp 
+   INTERFACE eos_fzp
       MODULE PROCEDURE eos_fzp_2d, eos_fzp_0d
    END INTERFACE
@@ -89 +89 @@
 
    !                               !!!  simplified eos coefficients (default value: Vallis 2006)
-   REAL(wp) ::   rn_a0      = 1.6550e-1_wp     ! thermal expansion coeff. 
-   REAL(wp) ::   rn_b0      = 7.6554e-1_wp     ! saline  expansion coeff. 
-   REAL(wp) ::   rn_lambda1 = 5.9520e-2_wp     ! cabbeling coeff. in T^2        
-   REAL(wp) ::   rn_lambda2 = 5.4914e-4_wp     ! cabbeling coeff. in S^2        
-   REAL(wp) ::   rn_mu1     = 1.4970e-4_wp     ! thermobaric coeff. in T  
-   REAL(wp) ::   rn_mu2     = 1.1090e-5_wp     ! thermobaric coeff. in S  
-   REAL(wp) ::   rn_nu      = 2.4341e-3_wp     ! cabbeling coeff. in theta*salt  
-   
+   REAL(wp) ::   rn_a0      = 1.6550e-1_wp     ! thermal expansion coeff.
+   REAL(wp) ::   rn_b0      = 7.6554e-1_wp     ! saline  expansion coeff.
+   REAL(wp) ::   rn_lambda1 = 5.9520e-2_wp     ! cabbeling coeff. in T^2
+   REAL(wp) ::   rn_lambda2 = 5.4914e-4_wp     ! cabbeling coeff. in S^2
+   REAL(wp) ::   rn_mu1     = 1.4970e-4_wp     ! thermobaric coeff. in T
+   REAL(wp) ::   rn_mu2     = 1.1090e-5_wp     ! thermobaric coeff. in S
+   REAL(wp) ::   rn_nu      = 2.4341e-3_wp     ! cabbeling coeff. in theta*salt
+
    ! TEOS10/EOS80 parameters
    REAL(wp) ::   r1_S0, r1_T0, r1_Z0, rdeltaS
-   
+
    ! EOS parameters
    REAL(wp) ::   EOS000 , EOS100 , EOS200 , EOS300 , EOS400 , EOS500 , EOS600
@@ -117 +117 @@
    REAL(wp) ::   EOS022
    REAL(wp) ::   EOS003 , EOS103
-   REAL(wp) ::   EOS013 
-   
+   REAL(wp) ::   EOS013
+
    ! ALPHA parameters
    REAL(wp) ::   ALP000 , ALP100 , ALP200 , ALP300 , ALP400 , ALP500
@@ -133 +133 @@
    REAL(wp) ::   ALP012
    REAL(wp) ::   ALP003
-   
+
    ! BETA parameters
    REAL(wp) ::   BET000 , BET100 , BET200 , BET300 , BET400 , BET500
@@ -160 +160 @@
    REAL(wp) ::   PEN002 , PEN102
    REAL(wp) ::   PEN012
-   
+
    ! ALPHA_PEN parameters
    REAL(wp) ::   APE000 , APE100 , APE200 , APE300
@@ -295 +295 @@
                &  + rn_b0 * ( 1._wp - 0.5_wp*rn_lambda2*zs - rn_mu2*zh ) * zs   &
                &  - rn_nu * zt * zs
-               !                                 
+               !
             prd(ji,jj,jk) = zn * r1_rho0 * ztm                ! density anomaly (masked)
          END_3D
@@ -448 +448 @@
             END_3D
          ENDIF
-         
+
       CASE( np_seos )                !==  simplified EOS  ==!
          !
@@ -997 +997 @@
       !!                  ***  ROUTINE bn2  ***
       !!
-      !! ** Purpose :   Compute the local Brunt-Vaisala frequency at the 
+      !! ** Purpose :   Compute the local Brunt-Vaisala frequency at the
       !!                time-step of the input arguments
       !!
@@ -1004 +1004 @@
       !!      N.B. N^2 is set one for all to zero at jk=1 in istate module.
       !!
-      !! ** Action  :   pn2 : square of the brunt-vaisala frequency at w-point 
+      !! ** Action  :   pn2 : square of the brunt-vaisala frequency at w-point
       !!
       !!----------------------------------------------------------------------
@@ -1021 +1021 @@
       DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 2, jpkm1 )      ! interior points only (2=< jk =< jpkm1 ); surface and bottom value set to zero one for all in istate.F90
          zrw =   ( gdepw(ji,jj,jk  ,Kmm) - gdept(ji,jj,jk,Kmm) )   &
-            &  / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) ) 
-            !
-         zaw = pab(ji,jj,jk,jp_tem) * (1. - zrw) + pab(ji,jj,jk-1,jp_tem) * zrw 
+            &  / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) )
+            !
+         zaw = pab(ji,jj,jk,jp_tem) * (1. - zrw) + pab(ji,jj,jk-1,jp_tem) * zrw
          zbw = pab(ji,jj,jk,jp_sal) * (1. - zrw) + pab(ji,jj,jk-1,jp_sal) * zrw
          !
@@ -1151 +1151 @@
          CALL ctl_stop( 'eos_fzp_2d:', ctmp1 )
          !
-      END SELECT      
+      END SELECT
       !
   END SUBROUTINE eos_fzp_2d_t
@@ -1208 +1208 @@
       !! ** Purpose :   Calculates nonlinear anomalies of alpha_PE, beta_PE and PE at T-points
       !!
-      !! ** Method  :   PE is defined analytically as the vertical 
+      !! ** Method  :   PE is defined analytically as the vertical
       !!                   primitive of EOS times -g integrated between 0 and z>0.
       !!                pen is the nonlinear bsq-PE anomaly: pen = ( PE - rho0 gz ) / rho0 gz - rd
-      !!                                                      = 1/z * /int_0^z rd dz - rd 
+      !!                                                      = 1/z * /int_0^z rd dz - rd
       !!                                where rd is the density anomaly (see eos_rhd function)
       !!                ab_pe are partial derivatives of PE anomaly with respect to T and S:
@@ -1275 +1275 @@
                !
             zn  = ( zn2 * zh + zn1 ) * zh + zn0
-            !                              
+            !
             pab_pe(ji,jj,jk,jp_tem) = zn * zh * r1_rho0 * ztm
             !
@@ -1290 +1290 @@
                !
             zn  = ( zn2 * zh + zn1 ) * zh + zn0
-            !                              
+            !
             pab_pe(ji,jj,jk,jp_sal) = zn / zs * zh * r1_rho0 * ztm
             !
@@ -1370 +1370 @@
          IF(lwp) WRITE(numout,*) '   ==>>>   use of TEOS-10 equation of state (cons. temp. and abs. salinity)'
          !
-         l_useCT = .TRUE.                          ! model temperature is Conservative temperature 
+         l_useCT = .TRUE.                          ! model temperature is Conservative temperature
          !
          rdeltaS = 32._wp
@@ -1751 +1751 @@
 
          r1_S0  = 0.875_wp/35.16504_wp   ! Used to convert CT in potential temperature when using bulk formulae (eos_pt_from_ct)
-         
+
          IF(lwp) THEN
             WRITE(numout,*)
@@ -1775 +1775 @@
       END SELECT
       !
-      rho0_rcp    = rho0 * rcp 
+      rho0_rcp    = rho0 * rcp
       r1_rho0     = 1._wp / rho0
       r1_rcp      = 1._wp / rcp
-      r1_rho0_rcp = 1._wp / rho0_rcp 
+      r1_rho0_rcp = 1._wp / rho0_rcp
       !
       IF(lwp) THEN