Changeset 15062
- Timestamp:
- 2021-06-28T13:19:48+02:00 (3 years ago)
- Location:
- NEMO/trunk/src
- Files:
-
- 18 edited
-
ICE/icedyn_rhg_eap.F90 (modified) (1 diff)
-
ICE/icedyn_rhg_evp.F90 (modified) (1 diff)
-
OCE/C1D/dtauvd.F90 (modified) (2 diffs)
-
OCE/C1D/dyndmp.F90 (modified) (1 diff)
-
OCE/DIA/diahsb.F90 (modified) (1 diff)
-
OCE/DOM/dom_oce.F90 (modified) (3 diffs)
-
OCE/FLO/flodom.F90 (modified) (1 diff)
-
OCE/FLO/flowri.F90 (modified) (1 diff)
-
OCE/ISF/isfcpl.F90 (modified) (1 diff)
-
OCE/ISF/isfparmlt.F90 (modified) (1 diff)
-
OCE/LDF/ldfslp.F90 (modified) (1 diff)
-
OCE/OBS/diaobs.F90 (modified) (1 diff)
-
OCE/OBS/obs_prep.F90 (modified) (1 diff)
-
OCE/SBC/sbcrnf.F90 (modified) (1 diff)
-
OCE/SBC/sbcssm.F90 (modified) (1 diff)
-
OCE/TRA/traldf_triad.F90 (modified) (1 diff)
-
OCE/ZDF/zdfswm.F90 (modified) (1 diff)
-
TOP/PISCES/SED/oce_sed.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/ICE/icedyn_rhg_eap.F90
r15014 r15062 66 66 !! * Substitutions 67 67 # include "do_loop_substitute.h90" 68 # include "domzgr_substitute.h90" 68 69 !!---------------------------------------------------------------------- 69 70 !! NEMO/ICE 4.0 , NEMO Consortium (2018) -
NEMO/trunk/src/ICE/icedyn_rhg_evp.F90
r15049 r15062 55 55 !! * Substitutions 56 56 # include "do_loop_substitute.h90" 57 # include "domzgr_substitute.h90" 57 58 !!---------------------------------------------------------------------- 58 59 !! NEMO/ICE 4.0 , NEMO Consortium (2018) -
NEMO/trunk/src/OCE/C1D/dtauvd.F90
r15023 r15062 33 33 !! * Substitutions 34 34 # include "do_loop_substitute.h90" 35 # include "domzgr_substitute.h90" 35 36 !!---------------------------------------------------------------------- 36 37 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 169 170 zvp(jk) = pvd(ji,jj,jpkm1) 170 171 ELSE ! inbetween : vertical interpolation between jkk & jkk+1 171 DO jkk = 1, jpkm1 ! when gdept(jkk) < zl < gdept(jkk+1)172 DO jkk = 1, jpkm1 ! when dept(jkk) < zl < dept(jkk+1) 172 173 IF( (zl-gdept_1d(jkk)) * (zl-gdept_1d(jkk+1)) <= 0._wp ) THEN 173 174 zi = ( zl - gdept_1d(jkk) ) / (gdept_1d(jkk+1)-gdept_1d(jkk)) -
NEMO/trunk/src/OCE/C1D/dyndmp.F90
r15023 r15062 44 44 !! * Substitutions 45 45 # include "do_loop_substitute.h90" 46 # include "domzgr_substitute.h90" 46 47 !!---------------------------------------------------------------------- 47 48 !! NEMO/OCE 4.0 , NEMO Consortium (2018) -
NEMO/trunk/src/OCE/DIA/diahsb.F90
r15048 r15062 186 186 ! 187 187 DO jk = 1, jpkm1 ! volume 188 ztmpk(:,:,jk,1) = surf (:,:) * e3t (:,:,jk,Kmm)*tmask(:,:,jk) &188 ztmpk(:,:,jk,1) = surf (:,:) * e3t(:,:,jk,Kmm)*tmask(:,:,jk) & 189 189 & - surf_ini(:,:) * e3t_ini(:,:,jk )*tmask_ini(:,:,jk) 190 190 END DO -
NEMO/trunk/src/OCE/DOM/dom_oce.F90
r15023 r15062 140 140 141 141 ! ! time-dependent scale factors (domvvl) 142 #if defined key_qco || defined key_linssh 143 #else 142 144 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: e3t, e3u, e3v, e3w, e3uw, e3vw !: vert. scale factor [m] 143 145 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: e3f !: F-point vert. scale factor [m] 144 146 #endif 145 147 ! ! time-dependent ratio ssh / h_0 (domqco) 146 148 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: r3t, r3u, r3v !: time-dependent ratio at t-, u- and v-point [-] … … 154 156 155 157 ! ! time-dependent depths of cells (domvvl) 158 #if defined key_qco || defined key_linssh 159 #else 156 160 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: gdept, gdepw 157 161 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: gde3w 158 162 #endif 159 163 ! ! reference heights of ocean water column and its inverse 160 164 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ht_0, r1_ht_0 !: t-depth [m] and [1/m] … … 164 168 165 169 ! ! time-dependent heights of ocean water column (domvvl) 170 #if defined key_qco || defined key_linssh 171 #else 166 172 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ht !: t-points [m] 167 173 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: hu, r1_hu !: u-depth [m] and [1/m] 168 174 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: hv, r1_hv !: v-depth [m] and [1/m] 169 175 #endif 170 176 INTEGER, PUBLIC :: nla10 !: deepest W level Above ~10m (nlb10 - 1) 171 177 INTEGER, PUBLIC :: nlb10 !: shallowest W level Bellow ~10m (nla10 + 1) -
NEMO/trunk/src/OCE/FLO/flodom.F90
r14229 r15062 33 33 REAL(wp), ALLOCATABLE, DIMENSION(:) :: zgifl, zgjfl, zgkfl ! distances in indexes 34 34 35 !! * Substitutions 36 # include "domzgr_substitute.h90" 35 37 !!---------------------------------------------------------------------- 36 38 !! NEMO/OCE 4.0 , NEMO Consortium (2018) -
NEMO/trunk/src/OCE/FLO/flowri.F90
r14239 r15062 33 33 REAL(wp), ALLOCATABLE, DIMENSION(:) :: ztem , zsal, zrho ! 2D workspace 34 34 35 !! * Substitutions 36 # include "domzgr_substitute.h90" 35 37 !!---------------------------------------------------------------------- 36 38 !! NEMO/OCE 4.0 , NEMO Consortium (2018) -
NEMO/trunk/src/OCE/ISF/isfcpl.F90
r15053 r15062 546 546 547 547 ! volume diff 548 zdvol = e3t 548 zdvol = e3t(ji,jj,jk,Kmm) * tmask (ji,jj,jk) & 549 549 & - ze3t_b(ji,jj,jk ) * ztmask_b(ji,jj,jk) 550 550 -
NEMO/trunk/src/OCE/ISF/isfparmlt.F90
r15004 r15062 28 28 29 29 PUBLIC isfpar_mlt 30 30 31 32 !! * Substitutions 33 # include "domzgr_substitute.h90" 31 34 !!---------------------------------------------------------------------- 32 35 !! NEMO/OCE 4.0 , NEMO Consortium (2018) -
NEMO/trunk/src/OCE/LDF/ldfslp.F90
r14834 r15062 208 208 zfj = MAX( omlmask(ji,jj,jk), omlmask(ji,jj+1,jk) ) 209 209 ! thickness of water column between surface and level k at u/v point 210 zdepu = 0.5_wp * ( ( gdept (ji,jj,jk,Kmm) + gdept(ji+1,jj,jk,Kmm) ) &210 zdepu = 0.5_wp * ( ( gdept(ji,jj,jk,Kmm) + gdept(ji+1,jj,jk,Kmm) ) & 211 211 & - 2 * MAX( risfdep(ji,jj), risfdep(ji+1,jj) ) & 212 212 & - e3u(ji,jj,miku(ji,jj),Kmm) ) 213 zdepv = 0.5_wp * ( ( gdept (ji,jj,jk,Kmm) + gdept(ji,jj+1,jk,Kmm) ) &213 zdepv = 0.5_wp * ( ( gdept(ji,jj,jk,Kmm) + gdept(ji,jj+1,jk,Kmm) ) & 214 214 & - 2 * MAX( risfdep(ji,jj), risfdep(ji,jj+1) ) & 215 215 & - e3v(ji,jj,mikv(ji,jj),Kmm) ) -
NEMO/trunk/src/OCE/OBS/diaobs.F90
r14982 r15062 604 604 !! ** Action : 605 605 !!---------------------------------------------------------------------- 606 USE dom_oce, ONLY : gdept, gdept_1d ! Ocean space domain variables (Kmm time-level only)607 606 USE phycst , ONLY : rday ! Physical constants 608 607 USE oce , ONLY : ts, uu, vv, ssh ! Ocean dynamics and tracers variables (Kmm time-level only) -
NEMO/trunk/src/OCE/OBS/obs_prep.F90
r14982 r15062 1072 1072 !!---------------------------------------------------------------------- 1073 1073 !! * Modules used 1074 USE dom_oce, ONLY : & ! Geographical information 1075 & gdepw_1d, & 1076 & gdepw_0, & 1077 & gdepw, r3t, & 1078 & gdept, & 1079 & ln_zco, & 1080 & ln_zps 1074 USE dom_oce ! Geographical information 1081 1075 1082 1076 !! * Arguments -
NEMO/trunk/src/OCE/SBC/sbcrnf.F90
r15058 r15062 231 231 ELSE !== runoff put only at the surface ==! 232 232 DO_2D_OVR( nn_hls, nn_hls, nn_hls, nn_hls ) 233 h_rnf (ji,jj) = e3t 233 h_rnf (ji,jj) = e3t(ji,jj,1,Kmm) ! update h_rnf to be depth of top box 234 234 END_2D 235 235 DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls ) -
NEMO/trunk/src/OCE/SBC/sbcssm.F90
r14072 r15062 246 246 sss_m(:,:) = ts (:,:,1,jp_sal,Kmm) 247 247 ssh_m(:,:) = ssh(:,:,Kmm) 248 e3t_m(:,:) = e3t 248 e3t_m(:,:) = e3t(:,:,1,Kmm) 249 249 frq_m(:,:) = 1._wp 250 250 ! -
NEMO/trunk/src/OCE/TRA/traldf_triad.F90
r14834 r15062 210 210 & * ( akz (ji,jj,jk) & 211 211 & + ah_wslp2(ji,jj,jk) & 212 & / ( e3w 212 & / ( e3w(ji,jj,jk,Kmm) * e3w(ji,jj,jk,Kmm) ) ) 213 213 END_3D 214 214 ELSEIF( ln_traldf_lap ) THEN ! laplacian operator -
NEMO/trunk/src/OCE/ZDF/zdfswm.F90
r14834 r15062 29 29 !! * Substitutions 30 30 # include "do_loop_substitute.h90" 31 # include "domzgr_substitute.h90" 31 32 !!---------------------------------------------------------------------- 32 33 !! NEMO/OCE 4.0 , NEMO Consortium (2018) -
NEMO/trunk/src/TOP/PISCES/SED/oce_sed.F90
r14086 r15062 15 15 USE dom_oce , ONLY : gphit => gphit !: latitude of t-point (degre) 16 16 17 #if ! defined key_qco 17 #if defined key_qco || defined key_linssh 18 #else 18 19 USE dom_oce , ONLY : e3t => e3t !: latitude of t-point (degre) 19 20 #endif
Note: See TracChangeset
for help on using the changeset viewer.
