diff --git a/code/post.f90 b/code/post.f90 index ac7db76..6bea585 100644 --- a/code/post.f90 +++ b/code/post.f90 @@ -278,12 +278,10 @@ READ (num) tmpr(1:2) READ (num) tmpr(1:2) - WRITE(*,'(a4,i3,a40,f8.3,a2,i7,a2,i5,a4,i5,a3,i5)') ' p ', myid, ': time / NCYC / fullsavenum = ',tnow,& - ' /',ncyc,' /',num,' || ',(num-startnum+1),' / ',(endnum-startnum+1) - - WRITE(*,*) ' Reading current data file and processing' - - WRITE(*,'(a10,i3,a10,i5,a10)') 'processor ', myid, ' processed ', nprogress, ' files' + WRITE(*,'(a2,i5,a3,i5,a2,a30,f8.3,a2,i7,a2,i5,a10,i3,a10,i5,a7)') & + '( ', (num-startnum+1), ' / ', (endnum-startnum+1), ' )', & + ' time / NCYC / fullsavenum = ', tnow, ' /', ncyc, ' /', num & + 'process ', myid, ' processed ', nprogress, ' files' num_=num diff --git a/code/termspecs/termspec.vnsd_fluctuation b/code/termspecs/termspec.vnsd_fluctuation index 36598af..0255baa 100644 --- a/code/termspecs/termspec.vnsd_fluctuation +++ b/code/termspecs/termspec.vnsd_fluctuation @@ -38,7 +38,9 @@ gradt_vnsd1 = ddx(vnsd) - nx * gradn_vnsd divn2_dndn = divn2 - gradn_gradn -sign_divn2_dndn = $dsign(1.0, divn) * divn2_dndn +sign_divn = $dsign(1.0, divn) + +sign_divn2_dndn = sign_divn * divn2_dndn vnsd_divn = vnsd * divn @@ -56,6 +58,16 @@ vnsd_divn2_dndn = vnsd * divn2_dndn vnsd_sign_divn2_dndn = vnsd * sign_divn2_dndn +vnsd_divn_nxfluc = vnsd * divn * nx' + +vnsd_divn_divnfluc = vnsd * divn * divn' + +vnsd_divn_abskfluc = vnsd * divn * absk' + +vnsd_dndn = vnsd * gradn_gradn + +sign_vnsd_dndn = sign_divn * vnsd * gradn_gradn + avg { c, u, v, w, fsd, lapc, ddx_c, ddy_c, ddz_c, d2dx_c, d2dy_c, d2dz_c } avg fsd { u, v, w, nx, ny, nz, absk, divn, @@ -73,5 +85,12 @@ vnsd_divn2_dndn, vnsd_divn2_dndn_cor, sign_divn2_dndn, vnsd_sign_divn2_dndn, -vnsd_sign_divn2_dndn_cor +vnsd_sign_divn2_dndn_cor, + +vnsd_divn_nxfluc, +vnsd_divn_divnfluc, +vnsd_divn_abskfluc, +vnsd_dndn, +sign_vnsd_dndn + }