Changeset 14131
- Timestamp:
- 2020-12-08T13:09:14+01:00 (4 years ago)
- Location:
- NEMO/trunk/src/OCE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/OCE/TRA/eosbn2.F90
r14072 r14131 89 89 90 90 ! !!! 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. 93 93 REAL(wp) :: rn_lambda1 = 5.9520e-2_wp ! cabbeling coeff. in T^2 94 94 REAL(wp) :: rn_lambda2 = 5.4914e-4_wp ! cabbeling coeff. in S^2 -
NEMO/trunk/src/OCE/TRA/trazdf.F90
r14127 r14131 23 23 USE trd_oce ! trends: ocean variables 24 24 USE trdtra ! trends: tracer trend manager 25 USE eosbn2, ONLY: ln_SEOS, rn_b0 25 26 ! 26 27 USE in_out_manager ! I/O manager … … 84 85 ! JMM : restore negative salinities to small salinities: 85 86 !!jc: discard this correction in case salinity is not used in eos 86 IF ( .NOT.(ln_ seos.AND.(rn_lambda2==0._wp)) ) THEN87 IF ( .NOT.(ln_SEOS.AND.(rn_b0==0._wp)) ) THEN 87 88 WHERE( pts(A2D(0),:,jp_sal,Kaa) < 0._wp ) pts(A2D(0),:,jp_sal,Kaa) = 0.1_wp 88 89 ENDIF -
NEMO/trunk/src/OCE/stpctl.F90
r14127 r14131 26 26 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 27 27 USE lib_mpp ! distributed memory computing 28 USE eosbn2 28 USE eosbn2, ONLY: ln_SEOS, rn_b0 29 29 ! 30 30 USE netcdf ! NetCDF library … … 184 184 ! !== done by all processes at every time step ==! 185 185 ! 186 IF ( ln_ seos.AND.(rn_lambda2==0._wp) ) THEN! Discard checks on salinity186 IF ( ln_SEOS.AND.(rn_b0==0._wp) ) THEN ! Discard checks on salinity 187 187 zmaxsal = +1.e38 ! if not used in eos 188 188 zminsal = -1.e38
Note: See TracChangeset
for help on using the changeset viewer.