Changeset 3792
- Timestamp:
- 2013-02-10T20:06:22+01:00 (11 years ago)
- Location:
- branches/2012/dev_MERGE_2012/NEMOGCM/NEMO
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90
r3680 r3792 760 760 ! ------------------------------------------------- 761 761 762 IF( ( lk_trdmld ) .AND. ( MOD( nitend , nn_trd ) /= 0 ) ) THEN762 IF( ( lk_trdmld ) .AND. ( MOD( nitend-nit000+1, nn_trd ) /= 0 ) ) THEN 763 763 WRITE(numout,cform_err) 764 764 WRITE(numout,*) ' Your nitend parameter, nitend = ', nitend -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90
r3764 r3792 423 423 zthermal = rn_alpha / ( rcp * zrhos + epsln ) 424 424 zhalin = rn_beta * tsn(ji,jj,1,jp_sal) * rcs 425 zbeta = rn_beta 425 426 ENDIF 426 427 ! Radiative surface buoyancy force … … 428 429 ! Non radiative surface buoyancy force 429 430 zBo (ji,jj) = grav * zthermal * qns(ji,jj) - grav * zhalin * ( emp(ji,jj)-rnf(ji,jj) ) & 430 & - grav * rbeta * rcs * sfx(ji,jj)431 & - grav * zbeta * rcs * sfx(ji,jj) 431 432 ! Surface Temperature flux for non-local term 432 433 wt0(ji,jj) = - ( qsr(ji,jj) + qns(ji,jj) )* r1_rau0_rcp * tmask(ji,jj,1) … … 1306 1307 ! 1307 1308 INTEGER :: ji, jj, jk, jn ! Dummy loop indices 1309 CHARACTER (len=35) :: charout 1308 1310 REAL(wp) :: ztra, zflx 1309 1311 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: ztrtrd … … 1335 1337 END DO 1336 1338 END DO 1337 ! save the non-local tracer flux trends for diagnostic 1338 IF( l_trdtrc ) ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:) 1339 CALL trd_tra( kt, 'TRC', jn, jptra_trd_zdf, ztrtrd(:,:,:,jn) ) 1339 ! 1340 IF( l_trdtrc ) THEN ! save the non-local tracer flux trends for diagnostic 1341 ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:) 1342 CALL trd_tra( kt, 'TRC', jn, jptra_trd_zdf, ztrtrd(:,:,:) ) 1343 ENDIF 1340 1344 ! 1341 1345 END DO … … 1343 1347 IF( ln_ctl ) THEN 1344 1348 WRITE(charout, FMT="(' kpp')") ; CALL prt_ctl_trc_info(charout) 1345 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=c lname, clinfo2='trd' )1349 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) 1346 1350 ENDIF 1347 1351 ! -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90
r3680 r3792 17 17 !!---------------------------------------------------------------------- 18 18 USE trc ! tracer definitions (trn, trb, tra, etc.) 19 USE trc_oce, ONLY : nn_dttrc ! frequency of step on passive tracers 19 20 USE dom_oce ! domain definition 20 USE zdfmxl , ONLY : nmln ! :number of level in the mixed layer21 USE zdf_oce , ONLY : avt ! :vert. diffusivity coef. at w-point for temp21 USE zdfmxl , ONLY : nmln ! number of level in the mixed layer 22 USE zdf_oce , ONLY : avt ! vert. diffusivity coef. at w-point for temp 22 23 # if defined key_zdfddm 23 USE zdfddm , ONLY : avs ! :salinity vertical diffusivity coeff. at w-point24 USE zdfddm , ONLY : avs ! salinity vertical diffusivity coeff. at w-point 24 25 # endif 25 26 USE trcnam_trp ! passive tracers transport namelist variables … … 1173 1174 ! ------------------------------------------------- 1174 1175 1175 IF( ( lk_trdmld_trc ) .AND. ( MOD( nitend , nn_trd_trc ) /= 0 ) ) THEN1176 IF( ( lk_trdmld_trc ) .AND. ( MOD( nitend-nittrc000+1, nn_trd_trc ) /= 0 ) ) THEN 1176 1177 WRITE(numout,cform_err) 1177 1178 WRITE(numout,*) ' Your nitend parameter, nitend = ', nitend
Note: See TracChangeset
for help on using the changeset viewer.