Changeset 15623
- Timestamp:
- 2021-12-30T10:04:54+01:00 (2 years ago)
- Location:
- NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/IOM/restart.F90
r15574 r15623 177 177 CALL iom_rstput( kt, nitrst, numrow, 'tn' , ts(:,:,:,jp_tem,Kmm) ) 178 178 CALL iom_rstput( kt, nitrst, numrow, 'sn' , ts(:,:,:,jp_sal,Kmm) ) 179 IF( .NOT.lk_SWE ) CALL iom_rstput( kt, nitrst, numrow, 'rhop', rhop )179 !!$ IF( .NOT.lk_SWE ) CALL iom_rstput( kt, nitrst, numrow, 'rhop', rhop ) 180 180 #endif 181 181 ENDIF … … 291 291 CALL iom_get( numror, jpdom_auto, 'uu_b' , uu_b(:,: ,Kbb), cd_type = 'U', psgn = -1._wp ) 292 292 CALL iom_get( numror, jpdom_auto, 'vv_b' , vv_b(:,: ,Kbb), cd_type = 'V', psgn = -1._wp ) 293 uu(:,:,: ,Kmm) = uu(:,:,: ,Kbb) ! all now value set to before for initialisation (sbc_ssm_init) 294 vv(:,:,: ,Kmm) = vv(:,:,: ,Kbb) 295 ts(:,:,:,:,Kmm) = ts(:,:,:,:,Kbb) 293 296 #else 294 297 ! !* Read Kmm fields (MLF only) … … 314 317 #endif 315 318 ! 316 IF( .NOT.lk_SWE ) THEN 317 IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN 318 CALL iom_get( numror, jpdom_auto, 'rhop' , rhop ) ! now potential density 319 ELSE 320 #if defined key_RK3 321 CALL eos( ts, Kbb, rhop ) 322 #else 323 CALL eos( ts, Kmm, rhop ) 324 #endif 325 !!#if defined key_qco 326 !! ALLOCATE( zgdept(jpi,jpj,jpk) ) 327 !! DO jk = 1, jpk 328 !! zgdept(:,:,jk) = gdept(:,:,jk,Kmm) 329 !! END DO 330 !! CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, zgdept ) 331 !! DEALLOCATE( zgdept ) 332 !!#else 333 !! CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, gdept(:,:,:,Kmm) ) 334 !!#endif 335 ENDIF 336 ENDIF 319 !!$ IF( .NOT.lk_SWE ) THEN 320 !!$ IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN 321 !!$ CALL iom_get( numror, jpdom_auto, 'rhop' , rhop ) ! now potential density 322 !!$ ELSE 323 !!$#if defined key_RK3 324 !!$ CALL eos( ts, Kbb, rhop ) ! not rhop but rhd 325 !!$#else 326 !!$ CALL eos( ts, Kmm, rhop ) 327 !!$#endif 328 !!$ ENDIF 329 !!$ ENDIF 337 330 ! 338 331 END SUBROUTINE rst_read … … 378 371 ! 379 372 ! !* RK3: Set ssh at Kmm for AGRIF 380 ssh(:,:,Kmm) = 0._wp373 ssh(:,:,Kmm) = ssh(:,:,Kbb) 381 374 #else 382 375 ! !* MLF: Read ssh at Kmm -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traadv_fct.F90
r15574 r15623 187 187 & + zwz(ji,jj,jk) - zwz(ji ,jj ,jk+1) ) * r1_e1e2t(ji,jj) 188 188 ! ! update and guess with monotonic sheme 189 !!st pt should be updated with a DO_3D( 0,0,0,0, 1, jpkm1 ) values outside the interior are wrong but unused. 189 190 pt(ji,jj,jk,jn,Krhs) = pt(ji,jj,jk,jn,Krhs) + ztra & 190 191 & / e3t(ji,jj,jk,Kmm ) * tmask(ji,jj,jk) -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRD/trdglo.F90
r13497 r15623 202 202 zkepe(:,:,:) = 0._wp 203 203 204 CALL eos( ts(:,:,:,:,Kmm), rhd, rhop ) ! now potential density204 !!clem st dbg CALL eos( ts(:,:,:,:,Kmm), rhd, rhop ) ! now potential density 205 205 206 206 zcof = 0.5_wp / rho0 ! Density flux at w-point -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3.F90
r15513 r15623 157 157 CALL zdf_phy( kstp, Nbb, Nbb, Nrhs ) ! vertical physics update (top/bot drag, avt, avs, avm + MLD) 158 158 !!gm 159 !!st check with gm !!!!! 160 CALL eos( ts(:,:,:,:,Nbb), rhd, rhop, gdept_0(:,:,:) ) ! now in situ density for tramle slope computation 159 161 ! LATERAL PHYSICS 160 162 ! 161 163 IF( l_ldfslp ) THEN ! slope of lateral mixing 162 164 !!gm gdep 163 165 !!st CALL eos( ts(:,:,:,:,Nbb), rhd, gdept_0(:,:,:) ) ! before in situ density 164 166 165 167 IF( ln_zps .AND. .NOT. ln_isfcav) &
Note: See TracChangeset
for help on using the changeset viewer.