Changeset 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC
- Timestamp:
- 2010-09-10T12:32:58+02:00 (14 years ago)
- Location:
- branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/dtadyn.F90
r2053 r2082 184 184 185 185 IF( lk_ldfslp ) THEN 186 ! Computes slopes 187 ! Caution : here tn, sn and avt are used as workspace 188 tn (:,:,:) = tdta (:,:,:,2) 189 sn (:,:,:) = sdta (:,:,:,2) 190 avt(:,:,:) = avtdta(:,:,:,2) 191 192 CALL eos( tn, sn, rhd, rhop ) ! Time-filtered in situ density 193 CALL bn2( tn, sn, rn2 ) ! before Brunt-Vaisala frequency 186 ! Computes slopes. Caution : here tsn and avt are used as workspace 187 tsn (:,:,:,jp_tem) = tdta (:,:,:,2) 188 tsn (:,:,:,jp_sal) = sdta (:,:,:,2) 189 avt(:,:,:) = avtdta(:,:,:,2) 190 191 CALL eos( tsn, rhd, rhop ) ! Time-filtered in situ density 192 CALL bn2( tsn, rn2 ) ! before Brunt-Vaisala frequency 194 193 IF( ln_zps ) & 195 & CALL zps_hde( kt, tn , sn , rhd, & ! Partial steps: before Horizontal DErivative 196 & gtu, gsu, gru, & ! of t, s, rd at the bottom ocean level 197 & gtv, gsv, grv ) 194 & CALL zps_hde( kt, jpts, tsn, gtsu, gtsv, & ! Partial steps: before Horizontal DErivative 195 & rhd, gru , grv ) ! of t, s, rd at the bottom ocean level 198 196 CALL zdf_mxl( kt ) ! mixed layer depth 199 197 CALL ldf_slp( kt, rhd, rn2 ) … … 213 211 214 212 IF( lk_ldfslp ) THEN 215 ! Computes slopes 216 ! Caution : here tn, sn and avt are used as workspace 217 tn (:,:,:) = tdta (:,:,:,2) 218 sn (:,:,:) = sdta (:,:,:,2) 219 avt(:,:,:) = avtdta(:,:,:,2) 220 221 CALL eos( tn, sn, rhd, rhop ) ! Time-filtered in situ density 222 CALL bn2( tn, sn, rn2 ) ! before Brunt-Vaisala frequency 213 ! Computes slopes. Caution : here tsn and avt are used as workspace 214 tsn (:,:,:,jp_tem) = tdta (:,:,:,2) 215 tsn (:,:,:,jp_sal) = sdta (:,:,:,2) 216 avt(:,:,:) = avtdta(:,:,:,2) 217 218 CALL eos( tsn, rhd, rhop ) ! Time-filtered in situ density 219 CALL bn2( tsn, rn2 ) ! before Brunt-Vaisala frequency 223 220 IF( ln_zps ) & 224 & CALL zps_hde( kt, tn , sn , rhd, & ! Partial steps: before Horizontal DErivative 225 & gtu, gsu, gru, & ! of t, s, rd at the bottom ocean level 226 & gtv, gsv, grv ) 221 & CALL zps_hde( kt, jpts, tsn, gtsu, gtsv, & ! Partial steps: before Horizontal DErivative 222 & rhd, gru , grv ) ! of t, s, rd at the bottom ocean level 227 223 CALL zdf_mxl( kt ) ! mixed layer depth 228 224 CALL ldf_slp( kt, rhd, rn2 ) … … 261 257 262 258 IF( lk_ldfslp ) THEN 263 ! Computes slopes 264 ! Caution : here tn, sn and avt are used as workspace 265 tn (:,:,:) = tdta (:,:,:,2) 266 sn (:,:,:) = sdta (:,:,:,2) 267 avt(:,:,:) = avtdta(:,:,:,2) 268 269 CALL eos( tn, sn, rhd, rhop ) ! Time-filtered in situ density 270 CALL bn2( tn, sn, rn2 ) ! before Brunt-Vaisala frequency 259 ! Computes slopes. Caution : here tsn and avt are used as workspace 260 tsn (:,:,:,jp_tem) = tdta (:,:,:,2) 261 tsn (:,:,:,jp_sal) = sdta (:,:,:,2) 262 avt(:,:,:) = avtdta(:,:,:,2) 263 264 CALL eos( tsn, rhd, rhop ) ! Time-filtered in situ density 265 CALL bn2( tsn, rn2 ) ! before Brunt-Vaisala frequency 271 266 IF( ln_zps ) & 272 & CALL zps_hde( kt, tn , sn , rhd, & ! Partial steps: before Horizontal DErivative 273 & gtu, gsu, gru, & ! of t, s, rd at the bottom ocean level 274 & gtv, gsv, grv ) 267 & CALL zps_hde( kt, jpts, tsn, gtsu, gtsv, & ! Partial steps: before Horizontal DErivative 268 & rhd, gru , grv ) ! of t, s, rd at the bottom ocean level 275 269 CALL zdf_mxl( kt ) ! mixed layer depth 276 270 CALL ldf_slp( kt, rhd, rn2 ) … … 311 305 312 306 ! In any case, we need rhop 313 CALL eos( t n,sn, rhd, rhop )307 CALL eos( tsn, rhd, rhop ) 314 308 315 309 #if ! defined key_degrad && defined key_traldf_c2d … … 320 314 ! Compute bbl coefficients if needed 321 315 IF( lk_trabbl ) THEN 322 tb(:,:,:) = tn(:,:,:) 323 sb(:,:,:) = sn(:,:,:) 316 tsb(:,:,:,:) = tsn(:,:,:,:) 324 317 CALL bbl( kt, 'TRC') 325 318 END IF … … 735 728 !!---------------------------------------------------------------------- 736 729 737 t n (:,:,:) = tdta (:,:,:,2)738 sn (:,:,:) = sdta (:,:,:,2)739 avt(:,:,:) = avtdta(:,:,:,2)730 tsn(:,:,:,jp_tem) = tdta (:,:,:,2) 731 tsn(:,:,:,jp_sal) = sdta (:,:,:,2) 732 avt(:,:,:) = avtdta(:,:,:,2) 740 733 741 734 un (:,:,:) = udta (:,:,:,2) … … 796 789 zweighm1 = 1. - pweigh 797 790 798 t n (:,:,:) = zweighm1 * tdta (:,:,:,1) + pweigh * tdta (:,:,:,2)799 sn (:,:,:) = zweighm1 * sdta (:,:,:,1) + pweigh * sdta (:,:,:,2)800 avt(:,:,:) = zweighm1 * avtdta(:,:,:,1) + pweigh * avtdta(:,:,:,2)791 tsn(:,:,:,jp_tem) = zweighm1 * tdta (:,:,:,1) + pweigh * tdta (:,:,:,2) 792 tsn(:,:,:,jp_sal) = zweighm1 * sdta (:,:,:,1) + pweigh * sdta (:,:,:,2) 793 avt(:,:,:) = zweighm1 * avtdta(:,:,:,1) + pweigh * avtdta(:,:,:,2) 801 794 802 795 un (:,:,:) = zweighm1 * udta (:,:,:,1) + pweigh * udta (:,:,:,2) -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/istate.F90
r1715 r2082 59 59 ; hdivn(:,:,:) = 0.e0 ; 60 60 61 ; tn (:,:,:) = 0.e0 ; ta (:,:,:) = 0.e0 62 ; sn (:,:,:) = 0.e0 ; sa (:,:,:) = 0.e0 61 ; tsn (:,:,:,:) = 0.e0 63 62 64 63 rhd (:,:,:) = 0.e0 -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OFF_SRC/opa.F90
r2053 r2082 223 223 224 224 225 ! ! General initialization 225 226 CALL phy_cst ! Physical constants 226 227 CALL eos_init ! Equation of state … … 234 235 IF( lk_zdfddm .AND. .NOT. lk_zdfkpp ) & 235 236 & CALL zdf_ddm_init ! double diffusive mixing 236 ! ! Lateral physics237 237 #if ! defined key_degrad 238 238 CALL ldf_tra_init ! Lateral ocean tracer physics 239 239 #endif 240 240 IF( lk_ldfslp ) CALL ldf_slp_init ! slope of lateral mixing 241 241 242 ! ! Active tracers 242 243 CALL tra_qsr_init ! penetrative solar radiation qsr 243 244 IF( lk_trabbl ) CALL tra_bbl_init ! advective (and/or diffusive) bottom boundary layer scheme 244 245 245 CALL trc_ini ! Passive tracers 246 ! ! Passive tracers 247 CALL trc_init ! Passive tracers initialization 248 ! ! Dynamics 246 249 CALL dta_dyn_init ! Initialization for the dynamics 247 250 CALL iom_init ! iom_put initialization
Note: See TracChangeset
for help on using the changeset viewer.