New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 14131 – NEMO

Changeset 14131


Ignore:
Timestamp:
2020-12-08T13:09:14+01:00 (4 years ago)
Author:
jchanut
Message:

#2537, repais rcompilation issue induced by previous commit

Location:
NEMO/trunk/src/OCE
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/TRA/eosbn2.F90

    r14072 r14131  
    8989 
    9090   !                               !!!  simplified eos coefficients (default value: Vallis 2006) 
    91    REAL(wp) ::   rn_a0      = 1.6550e-1_wp     ! thermal expansion coeff. 
    92    REAL(wp) ::   rn_b0      = 7.6554e-1_wp     ! saline  expansion coeff. 
     91   REAL(wp), PUBLIC ::   rn_a0      = 1.6550e-1_wp     ! thermal expansion coeff. 
     92   REAL(wp), PUBLIC ::   rn_b0      = 7.6554e-1_wp     ! saline  expansion coeff. 
    9393   REAL(wp) ::   rn_lambda1 = 5.9520e-2_wp     ! cabbeling coeff. in T^2 
    9494   REAL(wp) ::   rn_lambda2 = 5.4914e-4_wp     ! cabbeling coeff. in S^2 
  • NEMO/trunk/src/OCE/TRA/trazdf.F90

    r14127 r14131  
    2323   USE trd_oce        ! trends: ocean variables 
    2424   USE trdtra         ! trends: tracer trend manager 
     25   USE eosbn2, ONLY: ln_SEOS, rn_b0 
    2526   ! 
    2627   USE in_out_manager ! I/O manager 
     
    8485      ! JMM : restore negative salinities to small salinities: 
    8586!!jc: discard this correction in case salinity is not used in eos 
    86       IF ( .NOT.(ln_seos.AND.(rn_lambda2==0._wp)) ) THEN 
     87      IF ( .NOT.(ln_SEOS.AND.(rn_b0==0._wp)) ) THEN 
    8788         WHERE( pts(A2D(0),:,jp_sal,Kaa) < 0._wp )   pts(A2D(0),:,jp_sal,Kaa) = 0.1_wp 
    8889      ENDIF 
  • NEMO/trunk/src/OCE/stpctl.F90

    r14127 r14131  
    2626   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    2727   USE lib_mpp         ! distributed memory computing 
    28    USE eosbn2 
     28   USE eosbn2, ONLY: ln_SEOS, rn_b0 
    2929   ! 
    3030   USE netcdf          ! NetCDF library 
     
    184184      !                                   !==  done by all processes at every time step  ==! 
    185185      ! 
    186       IF ( ln_seos.AND.(rn_lambda2==0._wp) ) THEN        ! Discard checks on salinity 
     186      IF ( ln_SEOS.AND.(rn_b0==0._wp) ) THEN             ! Discard checks on salinity 
    187187         zmaxsal = +1.e38                                ! if not used in eos 
    188188         zminsal = -1.e38  
Note: See TracChangeset for help on using the changeset viewer.