From a383788431456054140fe3e7d45c8b929532c0cd Mon Sep 17 00:00:00 2001 From: Katherine Heisey Date: Mon, 17 Mar 2014 17:28:16 +0000 Subject: [PATCH] finished updating examples .rea and .usr to reflect default p66/p67 set to binary output and added EXTBAR flag to makenek.inc for BGQ git-svn-id: https://svn.mcs.anl.gov/repos/nek5/examples@1011 24248562-e74d-0410-ab4b-d4d80c744c73 --- 2d_eigtest/eig1.rea | 10 +++++----- 2d_eigtest/eig1.usr | 4 ++-- 3dbox/b3d.rea | 10 +++++----- 3dbox/base.rea | 10 +++++----- axi/axi.rea | 8 ++++---- axi/axi.usr | 4 ++-- axi/axisymmetric.rea | 6 +++--- benard/ray_9.rea | 10 +++++----- benard/ray_9.usr | 4 ++-- benard/ray_cr.usr | 4 ++-- benard/ray_dd.rea | 8 ++++---- benard/ray_dn.rea | 8 ++++---- benard/ray_nn.rea | 6 +++--- conj_ht/conj_ht.rea | 10 +++++----- conj_ht/conj_ht.usr | 4 ++-- cyl_restart/ca.rea | 4 ++-- cyl_restart/cb.rea | 4 ++-- cyl_restart/pa.rea | 4 ++-- cyl_restart/pb.rea | 4 ++-- eddy/eddy_uv.rea | 6 +++--- eddy/eddy_uv.usr | 4 ++-- eddy_neknek/eddy_uv.usr | 4 ++-- eddy_neknek/inside.rea | 6 +++--- eddy_neknek/outside.rea | 6 +++--- eddy_psi_omega/psi_omega.rea | 6 +++--- expansion/cyl2d.rea | 6 +++--- expansion/expansion.rea | 6 +++--- ext_cyl/ext_cyl.rea | 6 +++--- ext_cyl/ext_cyl.usr | 4 ++-- ext_cyl/import.rea | 4 ++-- fs_2/st1.rea | 14 +++++++------- fs_2/st1.usr | 4 ++-- fs_2/st2.rea | 14 +++++++------- fs_2/st2.usr | 4 ++-- fs_2/std_wv.rea | 14 +++++++------- fs_2/std_wv.usr | 4 ++-- fs_hydro/fs_hydro.rea | 8 ++++---- fs_hydro/fs_hydro.usr | 4 ++-- hemi/hemi.rea | 16 ++++++++-------- hemi/hemi.usr | 4 ++-- kov_st_state/kov_st_stokes.rea | 4 ++-- lowMach_test/lowMach_test.rea | 2 +- lowMach_test/lowMach_test_ascii.rea | 2 +- mhd/gpf.rea | 2 +- mhd/gpf.usr | 3 --- mhd/gpf_b.rea | 2 +- mhd/gpf_m.rea | 2 +- moab/pipe.rea | 8 ++++---- moab_conjht/moab_conjht.rea | 8 ++++---- os7000/u3_t020_n13.rea | 4 ++-- os7000/u3_t020_n13.usr | 2 -- peris/peris.rea | 10 +++++----- peris/peris.usr | 2 -- pipe/helix.rea | 8 ++++---- pipe/stenosis.rea | 4 ++-- rayleigh/ray0.rea | 4 ++-- rayleigh/ray0.usr | 2 -- rayleigh/ray1.rea | 4 ++-- rayleigh/ray2.rea | 4 ++-- robin/robin.rea | 4 ++-- shear4/shear4.rea | 6 +++--- shear4/shear4.usr | 2 -- shear4/thin.rea | 6 +++--- shear4/thin.usr | 2 -- solid/solid.rea | 2 +- solid/solid.usr | 2 -- strat/re10f1000p0001.rea | 4 ++-- strat/re10f1000p1000.rea | 6 +++--- taylor/taylor.rea | 6 +++--- thermal_io/recirc.rea | 2 +- thermal_io/recirc.usr | 2 -- timing/timing.rea | 8 ++++---- turbChannel/base.rea | 8 ++++---- turbChannel/turbChannel.rea | 8 ++++---- turbJet/jet.rea | 8 ++++---- var_vis/st2.rea | 2 +- var_vis/st2.usr | 2 -- vortex/r1854a.rea | 6 +++--- vortex/r1854a.usr | 2 -- vortex2/v2d.rea | 6 +++--- vortex2/v2d.usr | 2 -- 81 files changed, 208 insertions(+), 231 deletions(-) diff --git a/2d_eigtest/eig1.rea b/2d_eigtest/eig1.rea index 669868b..dad0ec4 100644 --- a/2d_eigtest/eig1.rea +++ b/2d_eigtest/eig1.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 0.0000000E+00 p11 NSTEPS - -9.9999999E-09 p12 DT + -1.0000000E-08 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 1000.000 p15 IOSTEP @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999999E-09 p21 DIVERGENCE + 1.0000000E-08 p21 DIVERGENCE 1.0000000E-18 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-05 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-04 p24 TOLREL + 1.0000000E-05 p25 TOLABS 1.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -85,7 +85,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-05 p84 !=0 -->sets initial timestep if p12>0 + 1.0000000E-04 p84 !=0 -->sets initial timestep if p12>0 1.250000 p85 dt ratio if p84 !=0, for timesteps>0 0.0000000E+00 p86 reserved 0.0000000E+00 diff --git a/2d_eigtest/eig1.usr b/2d_eigtest/eig1.usr index f464601..943b348 100644 --- a/2d_eigtest/eig1.usr +++ b/2d_eigtest/eig1.usr @@ -180,8 +180,8 @@ c----------------------------------------------------------------------- include 'SIZE' include 'TOTAL' - param(66) = 4. ! These give the std nek binary i/o and are - param(67) = 4. ! good default values +c param(66) = 4. ! These give the std nek binary i/o and are +c param(67) = 4. ! good default values r0=0. r1=1. diff --git a/3dbox/b3d.rea b/3dbox/b3d.rea index fedc305..58e9560 100644 --- a/3dbox/b3d.rea +++ b/3dbox/b3d.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 10000.00 p11 NSTEPS - 9.9999998E-03 p12 DT + 0.01000 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 1000.000 p15 IOSTEP @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-05 p21 DIVERGENCE + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/3dbox/base.rea b/3dbox/base.rea index fedc305..d9767a8 100644 --- a/3dbox/base.rea +++ b/3dbox/base.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 10000.00 p11 NSTEPS - 9.9999998E-03 p12 DT + 1.0000000E-02 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 1000.000 p15 IOSTEP @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-05 p21 DIVERGENCE + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/axi/axi.rea b/axi/axi.rea index e9ae156..1a7e64a 100644 --- a/axi/axi.rea +++ b/axi/axi.rea @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 2.9999999E-08 p21 DIVERGENCE - 3.0000000E-10 p22 HELMHOLTZ + 0.3000000E-07 p21 DIVERGENCE + 0.3000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 4.9999999E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 0.5000000E-02 p24 TOLREL + 0.1000000E-01 p25 TOLABS 0.9000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/axi/axi.usr b/axi/axi.usr index ee75318..166c6d6 100644 --- a/axi/axi.usr +++ b/axi/axi.usr @@ -99,8 +99,8 @@ c----------------------------------------------------------------------- include 'SIZE' include 'TOTAL' - param(66) = 4. - param(67) = 4. +c param(66) = 4. +c param(67) = 4. return end diff --git a/axi/axisymmetric.rea b/axi/axisymmetric.rea index f28252d..e7347f8 100644 --- a/axi/axisymmetric.rea +++ b/axi/axisymmetric.rea @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 2.9999999E-08 p21 DIVERGENCE + 3.0000000E-08 p21 DIVERGENCE 3.0000000E-10 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 4.9999999E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 5.0000000E-03 p24 TOLREL + 0.1000000E-01 p25 TOLABS 0.9000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/benard/ray_9.rea b/benard/ray_9.rea index 8b64b74..1281d21 100644 --- a/benard/ray_9.rea +++ b/benard/ray_9.rea @@ -25,8 +25,8 @@ 0.0000000E+00 p21 DIVERGENCE 0.0000000E+00 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-06 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-05 p24 TOLREL + 1.0000000E-05 p25 TOLABS 2.010000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -76,8 +76,8 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 - 0.0000000E+00 + 0.03059 p75 k_c critical wave number (in .usr) + 1707.76 p76 Rayleigh number (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -124,7 +124,7 @@ 8.0632000E+00 p120 1.8879000E-02 p121 1.0095000E-02 p122 - 9.9999997E-05 p123 + 1.0000000E-04 p123 4 Lines of passive scalar data follows2 CONDUCT; 2RHOCP 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 diff --git a/benard/ray_9.usr b/benard/ray_9.usr index 8bfc3d0..7243227 100644 --- a/benard/ray_9.usr +++ b/benard/ray_9.usr @@ -208,8 +208,8 @@ c----------------------------------------------------------------------- call rayleigh_const - param(66) = 4 - param(67) = 4 +c param(66) = 4 +c param(67) = 4 ntot = nx1*ny1*nz1*nelv ! nelv as in rescale_x xmin = glmin(xm1,ntot) diff --git a/benard/ray_cr.usr b/benard/ray_cr.usr index 32b9617..8710a4e 100644 --- a/benard/ray_cr.usr +++ b/benard/ray_cr.usr @@ -198,8 +198,8 @@ c----------------------------------------------------------------------- call rayleigh_const - param(66) = 4 - param(67) = 4 +c param(66) = 4 +c param(67) = 4 one = 1. pi = 4.*atan(one) diff --git a/benard/ray_dd.rea b/benard/ray_dd.rea index eb34401..7de5f8f 100644 --- a/benard/ray_dd.rea +++ b/benard/ray_dd.rea @@ -25,8 +25,8 @@ 0.0000000E+00 p21 DIVERGENCE 0.0000000E+00 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-06 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-05 p24 TOLREL + 1.0000000E-05 p25 TOLABS 2.010000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -76,8 +76,8 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 - 0.0000000E+00 + 3.117 p75 k_c critical wave number (in .usr) + 1715. p76 Rayleigh number (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/benard/ray_dn.rea b/benard/ray_dn.rea index 4ad15b4..d372d62 100644 --- a/benard/ray_dn.rea +++ b/benard/ray_dn.rea @@ -25,8 +25,8 @@ 0.0000000E+00 p21 DIVERGENCE 0.0000000E+00 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-06 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-05 p24 TOLREL + 1.0000000E-05 p25 TOLABS 2.010000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -76,8 +76,8 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 - 0.0000000E+00 + 2.682 p75 k_c critical wave number (in .usr) + 1110. p76 Rayleigh number (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/benard/ray_nn.rea b/benard/ray_nn.rea index e82494c..421b8ff 100644 --- a/benard/ray_nn.rea +++ b/benard/ray_nn.rea @@ -26,7 +26,7 @@ 0.0000000E+00 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-07 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-05 p25 TOLABS 2.010000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -76,8 +76,8 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 - 0.0000000E+00 + 2.2214 p75 k_c critical wave number (in .usr) + 660. p76 Rayleigh number (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/conj_ht/conj_ht.rea b/conj_ht/conj_ht.rea index 3b3c5d3..864306d 100644 --- a/conj_ht/conj_ht.rea +++ b/conj_ht/conj_ht.rea @@ -8,7 +8,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 0.0000000E+00 + 1.0000000E+00 0.5000000 p08 CONDUCT 0.0000000E+00 0.0000000E+00 p10 FINTIME @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-06 p24 TOLREL - 9.9999997E-10 p25 TOLABS + 1.0000000E-05 p24 TOLREL + 1.0000000E-09 p25 TOLABS 0.5000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 0.0000000E+00 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 4 Lines of passive scalar data follows2 CONDUCT; 2RHOCP 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 diff --git a/conj_ht/conj_ht.usr b/conj_ht/conj_ht.usr index 16084b5..4eccca7 100644 --- a/conj_ht/conj_ht.usr +++ b/conj_ht/conj_ht.usr @@ -121,8 +121,8 @@ c----------------------------------------------------------------------- subroutine usrdat2 include 'SIZE' include 'TOTAL' - param(66) = 4 - param(67) = 4 +c param(66) = 4 +c param(67) = 4 return end c----------------------------------------------------------------------- diff --git a/cyl_restart/ca.rea b/cyl_restart/ca.rea index 8a1d1f2..dcfebcb 100644 --- a/cyl_restart/ca.rea +++ b/cyl_restart/ca.rea @@ -25,8 +25,8 @@ 1.0000000E-11 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 4.9999999E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 0.5000000E-02 p24 TOLREL + 0.1000000E-01 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/cyl_restart/cb.rea b/cyl_restart/cb.rea index 9e468c8..0abb3db 100644 --- a/cyl_restart/cb.rea +++ b/cyl_restart/cb.rea @@ -25,8 +25,8 @@ 1.0000000E-11 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 4.9999999E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 5.0000000E-03 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/cyl_restart/pa.rea b/cyl_restart/pa.rea index 552a88b..97ac2cd 100644 --- a/cyl_restart/pa.rea +++ b/cyl_restart/pa.rea @@ -25,8 +25,8 @@ 1.0000000E-11 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 4.9999999E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 5.0000000E-03 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/cyl_restart/pb.rea b/cyl_restart/pb.rea index 770dc39..187812d 100644 --- a/cyl_restart/pb.rea +++ b/cyl_restart/pb.rea @@ -25,8 +25,8 @@ 1.0000000E-11 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 4.9999999E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 5.0000000E-03 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/eddy/eddy_uv.rea b/eddy/eddy_uv.rea index 12a7372..6a86845 100644 --- a/eddy/eddy_uv.rea +++ b/eddy/eddy_uv.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 1000.000 p11 NSTEPS - -9.9999997E-05 p12 DT + -1.0000000E-04 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 100.0000 p15 IOSTEP @@ -97,8 +97,8 @@ 20.00000 p93 Numbr of prev pressure solns saved 5.000000 p94 start projecting vel. after p94 step 5.000000 p95 start projecting pr after p95 step - 0.0000000E+00 - 0.0000000E+00 + 1.00000 p96 u0 translational velocity (in .usr) + 0.30000 p97 v0 translational velocity (in .usr) 0.0000000E+00 3.000000 p99 dealiasing:if <0 disable 0.0000000E+00 p100 reserved diff --git a/eddy/eddy_uv.usr b/eddy/eddy_uv.usr index 7268fc9..213e83b 100644 --- a/eddy/eddy_uv.usr +++ b/eddy/eddy_uv.usr @@ -263,8 +263,8 @@ c----------------------------------------------------------------------- enddo enddo - param(66) = 4 - param(67) = 4 +c param(66) = 4 +c param(67) = 4 return end diff --git a/eddy_neknek/eddy_uv.usr b/eddy_neknek/eddy_uv.usr index eaa8d44..334e292 100644 --- a/eddy_neknek/eddy_uv.usr +++ b/eddy_neknek/eddy_uv.usr @@ -318,8 +318,8 @@ c nfld = 4 - u,v,w velocitites + temperature nfld=3 - param(66) = 4 - param(67) = 4 +c param(66) = 4 +c param(67) = 4 return end diff --git a/eddy_neknek/inside.rea b/eddy_neknek/inside.rea index 80bf99c..5184f09 100644 --- a/eddy_neknek/inside.rea +++ b/eddy_neknek/inside.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 1000.000 p11 NSTEPS - -9.9999997E-05 p12 DT + -1.0000000E-04 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 100.0000 p15 IOSTEP @@ -97,8 +97,8 @@ 20.00000 p93 Numbr of prev pressure solns saved 5.000000 p94 start projecting vel. after p94 step 5.000000 p95 start projecting pr after p95 step - 0.0000000E+00 - 0.0000000E+00 + 1.00000 p96 u0 translational velocity (in .usr) + 0.30000 p97 v0 translational velocity (in .usr) 0.0000000E+00 3.000000 p99 dealiasing:if <0 disable 0.0000000E+00 p100 reserved diff --git a/eddy_neknek/outside.rea b/eddy_neknek/outside.rea index 91375b9..1cf8610 100644 --- a/eddy_neknek/outside.rea +++ b/eddy_neknek/outside.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 1000.000 p11 NSTEPS - -9.9999997E-05 p12 DT + -1.0000000E-04 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 100.0000 p15 IOSTEP @@ -97,8 +97,8 @@ 20.00000 p93 Numbr of prev pressure solns saved 5.000000 p94 start projecting vel. after p94 step 5.000000 p95 start projecting pr after p95 step - 0.0000000E+00 - 0.0000000E+00 + 1.00000 p96 u0 translational velocity (in .usr) + 0.30000 p97 v0 translational velocity (in .usr) 0.0000000E+00 3.000000 p99 dealiasing:if <0 disable 0.0000000E+00 p100 reserved diff --git a/eddy_psi_omega/psi_omega.rea b/eddy_psi_omega/psi_omega.rea index 6b483d1..9678484 100644 --- a/eddy_psi_omega/psi_omega.rea +++ b/eddy_psi_omega/psi_omega.rea @@ -23,7 +23,7 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-10 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 1.0000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-10 p24 TOLREL 1.0000000E-10 p25 TOLABS @@ -97,8 +97,8 @@ 0.0000000E+00 p93 Numbr of prev pressure solns saved 0.0000000E+00 p94 start projecting vel. after p94 step 0.0000000E+00 p95 start projecting pr after p95 step - 0.0000000E+00 - 0.0000000E+00 + 0 16.0000E+00 p96 = u0 ! translational velocity for eddy.usr + 0 5.00000E+00 p97 = v0 ! translational velocity for eddy.usr 0.0000000E+00 3.000000 p99 dealiasing:if <0 disable 0.0000000E+00 p100 reserved diff --git a/expansion/cyl2d.rea b/expansion/cyl2d.rea index eb39a15..de90665 100644 --- a/expansion/cyl2d.rea +++ b/expansion/cyl2d.rea @@ -25,8 +25,8 @@ 1.0000000E-06 p21 DIVERGENCE 1.0000000E-07 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 0.0000000E+00 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 4 Lines of passive scalar data follows2 CONDUCT; 2RHOCP 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 diff --git a/expansion/expansion.rea b/expansion/expansion.rea index c4745aa..e852b2b 100644 --- a/expansion/expansion.rea +++ b/expansion/expansion.rea @@ -25,8 +25,8 @@ 1.0000000E-06 p21 DIVERGENCE 1.0000000E-07 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 0.0000000E+00 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/ext_cyl/ext_cyl.rea b/ext_cyl/ext_cyl.rea index 58ce10d..070015d 100644 --- a/ext_cyl/ext_cyl.rea +++ b/ext_cyl/ext_cyl.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 25000.00 p11 NSTEPS - -9.9999998E-03 p12 DT + -1.0000000E-02 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 200.0000 p15 IOSTEP @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-07 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 1.0000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-10 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-05 p25 TOLABS 1.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/ext_cyl/ext_cyl.usr b/ext_cyl/ext_cyl.usr index 2c2f4e0..65ee865 100644 --- a/ext_cyl/ext_cyl.usr +++ b/ext_cyl/ext_cyl.usr @@ -111,8 +111,8 @@ c----------------------------------------------------------------------- include 'SIZE' include 'TOTAL' - param(66) = 4. ! These give the std nek binary i/o and are - param(67) = 4. ! good default values +c param(66) = 4. ! These give the std nek binary i/o and are +c param(67) = 4. ! good default values return end diff --git a/ext_cyl/import.rea b/ext_cyl/import.rea index 9391908..98cc5da 100644 --- a/ext_cyl/import.rea +++ b/ext_cyl/import.rea @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-07 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 9.0000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-10 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-05 p25 TOLABS 1.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/fs_2/st1.rea b/fs_2/st1.rea index a56e58d..d09d28f 100644 --- a/fs_2/st1.rea +++ b/fs_2/st1.rea @@ -9,11 +9,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999998E-03 p08 CONDUCT + 1.0000000E-02 p08 CONDUCT 0.0000000E+00 0.0000000E+00 p10 FINTIME 200000.0 p11 NSTEPS - 4.9999999E-03 p12 DT + 5.0000000E-03 p12 DT 0.0000000E+00 p13 IOCOMM 1.000000 p14 IOTIME 0.0000000E+00 p15 IOSTEP @@ -25,8 +25,8 @@ 1.0000000E-10 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 0.4000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -48,7 +48,7 @@ 0.0000000E+00 p44 0=E-based/1=A-based prec. 0.0000000E+00 p45 Relaxation factor for DTFS 0.0000000E+00 p46 if >0, dont call SETICS - 9.4999999E-02 p47 vnu: mesh matieral prop + 9.5000000E-02 p47 vnu: mesh matieral prop 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -76,7 +76,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 + 0.0001 p75 perturbation amplitude (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 1.000000 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/fs_2/st1.usr b/fs_2/st1.usr index 364a191..10bbc01 100644 --- a/fs_2/st1.usr +++ b/fs_2/st1.usr @@ -147,8 +147,8 @@ c----------------------------------------------------------------------- nelx = 6 nely = 6 - param(66) = 4 ! std nek5000 output - param(67) = 4 +c param(66) = 4 ! std nek5000 output +c param(67) = 4 Re = 3.e4 ! hard-code Reynolds number visc = 1/Re diff --git a/fs_2/st2.rea b/fs_2/st2.rea index 5625535..8988d3b 100644 --- a/fs_2/st2.rea +++ b/fs_2/st2.rea @@ -9,11 +9,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999998E-03 p08 CONDUCT + 1.0000000E-02 p08 CONDUCT 0.0000000E+00 0.0000000E+00 p10 FINTIME 200000.0 p11 NSTEPS - 4.9999999E-03 p12 DT + 5.0000000E-03 p12 DT 0.0000000E+00 p13 IOCOMM 1.000000 p14 IOTIME 0.0000000E+00 p15 IOSTEP @@ -25,8 +25,8 @@ 1.0000000E-10 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 0.4000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -48,7 +48,7 @@ 0.0000000E+00 p44 0=E-based/1=A-based prec. 0.0000000E+00 p45 Relaxation factor for DTFS 0.0000000E+00 p46 if >0, dont call SETICS - 9.4999999E-02 p47 vnu: mesh matieral prop + 9.5000000E-02 p47 vnu: mesh matieral prop 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -76,7 +76,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 + 0.0001 p75 perturbation amplitude (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 1.000000 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/fs_2/st2.usr b/fs_2/st2.usr index 4a8aec5..97f51ba 100644 --- a/fs_2/st2.usr +++ b/fs_2/st2.usr @@ -148,8 +148,8 @@ c----------------------------------------------------------------------- nelx = 6 nely = 6 - param(66) = 4 ! std nek5000 output - param(67) = 4 +c param(66) = 4 ! std nek5000 output +c param(67) = 4 c Re = 3.e4 ! hard-code Reynolds number c visc = 1/Re diff --git a/fs_2/std_wv.rea b/fs_2/std_wv.rea index 5b19735..aa51757 100644 --- a/fs_2/std_wv.rea +++ b/fs_2/std_wv.rea @@ -9,11 +9,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999998E-03 p08 CONDUCT + 1.0000000E-02 p08 CONDUCT 0.0000000E+00 0.0000000E+00 p10 FINTIME 200000.0 p11 NSTEPS - 2.4999999E-03 p12 DT + 2.5000000E-03 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 100.0000 p15 IOSTEP @@ -25,8 +25,8 @@ 1.0000000E-10 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 0.4000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -48,7 +48,7 @@ 0.0000000E+00 p44 0=E-based/1=A-based prec. 0.0000000E+00 p45 Relaxation factor for DTFS 0.0000000E+00 p46 if >0, dont call SETICS - 9.4999999E-02 p47 vnu: mesh matieral prop + 9.5000000E-02 p47 vnu: mesh matieral prop 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -76,7 +76,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 + 0.0001 p75 perturbation amplitude (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 1.000000 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/fs_2/std_wv.usr b/fs_2/std_wv.usr index c63441f..199ae76 100644 --- a/fs_2/std_wv.usr +++ b/fs_2/std_wv.usr @@ -148,8 +148,8 @@ c----------------------------------------------------------------------- nelx = 6 nely = 6 - param(66) = 4 ! std nek5000 output - param(67) = 4 +c param(66) = 4 ! std nek5000 output +c param(67) = 4 c Re = 3.e4 ! hard-code Reynolds number c visc = 1/Re diff --git a/fs_hydro/fs_hydro.rea b/fs_hydro/fs_hydro.rea index 5e8f484..051670d 100644 --- a/fs_hydro/fs_hydro.rea +++ b/fs_hydro/fs_hydro.rea @@ -9,7 +9,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999998E-03 p08 CONDUCT + 1.0000000E-02 p08 CONDUCT 0.0000000E+00 0.0000000E+00 p10 FINTIME 5000.000 p11 NSTEPS @@ -25,8 +25,8 @@ 1.0000000E-10 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 0.5000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -76,7 +76,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 + 0.0001 p75 perturbation amplitude (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/fs_hydro/fs_hydro.usr b/fs_hydro/fs_hydro.usr index b4ecf51..f4d76ea 100644 --- a/fs_hydro/fs_hydro.usr +++ b/fs_hydro/fs_hydro.usr @@ -262,8 +262,8 @@ c Set surface tension on free surface call gen_pert_ic - param(66) = 4 ! std i/o - param(67) = 4 +c param(66) = 4 ! std i/o +c param(67) = 4 return end diff --git a/hemi/hemi.rea b/hemi/hemi.rea index fc54d63..92218a2 100644 --- a/hemi/hemi.rea +++ b/hemi/hemi.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 4000.000 p11 NSTEPS - -4.9999999E-03 p12 DT + -5.0000000E-03 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 100.0000 p15 IOSTEP @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-05 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-04 p24 TOLREL + 1.0000000E-05 p25 TOLABS 1.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -72,9 +72,9 @@ 0.0000000E+00 p68 iastep: freq for avg_all 0.0000000E+00 0.0000000E+00 - 0.0000000E+00 - 0.0000000E+00 - 0.0000000E+00 + 0.580000 p71 = delta_99 + 1.000000E+00 p72 timestep for particle data dump + 12000 p73 Total # of particles at any instant 0.0000000E+00 p74 verbose Helmholtz 0.0000000E+00 0.0000000E+00 @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 0.0000000E+00 p101 No. of additional filter modes 0.0000000E+00 - 4.9999999E-03 p103 weight of stabilizing filter (.01) + 5.0000000E-03 p103 weight of stabilizing filter (.01) 4 Lines of passive scalar data follows2 CONDUCT; 2RHOCP 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 diff --git a/hemi/hemi.usr b/hemi/hemi.usr index 006a328..ef72583 100644 --- a/hemi/hemi.usr +++ b/hemi/hemi.usr @@ -307,8 +307,8 @@ c----------------------------------------------------------------------- subroutine usrdat2 include 'SIZE' include 'TOTAL' - param(66) = 4 - param(67) = 4 +c param(66) = 4 +c param(67) = 4 return end c----------------------------------------------------------------------- diff --git a/kov_st_state/kov_st_stokes.rea b/kov_st_state/kov_st_stokes.rea index be97228..27d10d1 100644 --- a/kov_st_state/kov_st_stokes.rea +++ b/kov_st_state/kov_st_stokes.rea @@ -25,8 +25,8 @@ 0.0000000E+00 p21 DIVERGENCE 0.0000000E+00 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-05 p24 TOLREL - 9.9999997E-05 p25 TOLABS + 1.0000000E-04 p24 TOLREL + 1.0000000E-04 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/lowMach_test/lowMach_test.rea b/lowMach_test/lowMach_test.rea index 8312727..b8ad5c5 100644 --- a/lowMach_test/lowMach_test.rea +++ b/lowMach_test/lowMach_test.rea @@ -22,7 +22,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999999E-09 p21 DIVERGENCE + 1.0000000E-08 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-06 p24 TOLREL diff --git a/lowMach_test/lowMach_test_ascii.rea b/lowMach_test/lowMach_test_ascii.rea index 6a57209..a548687 100644 --- a/lowMach_test/lowMach_test_ascii.rea +++ b/lowMach_test/lowMach_test_ascii.rea @@ -22,7 +22,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-10 p21 DIVERGENCE + 1.0000000E-09 p21 DIVERGENCE 1.0000000E-12 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-06 p24 TOLREL diff --git a/mhd/gpf.rea b/mhd/gpf.rea index fa707e4..fd08f42 100644 --- a/mhd/gpf.rea +++ b/mhd/gpf.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 350.0000 p11 NSTEPS - -9.9999998E-03 p12 DT + -1.0000000E-02 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 2500.000 p15 IOSTEP diff --git a/mhd/gpf.usr b/mhd/gpf.usr index 89998c7..96fdab3 100644 --- a/mhd/gpf.usr +++ b/mhd/gpf.usr @@ -265,9 +265,6 @@ c call rescale_x(zm1,0.,zleng) - param(66) = 4 ! .fld -- comment out for .f - param(67) = 4 ! .fld -- comment out for .f - return end c----------------------------------------------------------------------- diff --git a/mhd/gpf_b.rea b/mhd/gpf_b.rea index 6fc8676..253fdae 100644 --- a/mhd/gpf_b.rea +++ b/mhd/gpf_b.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 350.0000 p11 NSTEPS - -9.9999998E-03 p12 DT + -1.0000000E-02 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 2500.000 p15 IOSTEP diff --git a/mhd/gpf_m.rea b/mhd/gpf_m.rea index dfcde91..b3f846e 100644 --- a/mhd/gpf_m.rea +++ b/mhd/gpf_m.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 350.0000 p11 NSTEPS - -9.9999998E-03 p12 DT + -1.0000000E-02 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 2500.000 p15 IOSTEP diff --git a/moab/pipe.rea b/moab/pipe.rea index 58f8e08..4b76a95 100644 --- a/moab/pipe.rea +++ b/moab/pipe.rea @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 4.9999999E-05 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 5.0000000E-05 p21 DIVERGENCE + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999999E-09 p24 TOLREL - 9.9999998E-15 p25 TOLABS + 1.0000000E-08 p24 TOLREL + 1.0000000E-14 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/moab_conjht/moab_conjht.rea b/moab_conjht/moab_conjht.rea index cc64147..26f3e71 100644 --- a/moab_conjht/moab_conjht.rea +++ b/moab_conjht/moab_conjht.rea @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-06 p24 TOLREL - 9.9999997E-10 p25 TOLABS + 1.0000000E-05 p24 TOLREL + 1.0000000E-09 p25 TOLABS 0.5000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 0.0000000E+00 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 4 Lines of passive scalar data follows2 CONDUCT; 2RHOCP 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 diff --git a/os7000/u3_t020_n13.rea b/os7000/u3_t020_n13.rea index e26bee4..f206fcd 100644 --- a/os7000/u3_t020_n13.rea +++ b/os7000/u3_t020_n13.rea @@ -77,11 +77,11 @@ 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz 0.0000000E+00 + 1.00000 p76 1 = use distributed Eo-1 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 0.0000000E+00 - 0.0000000E+00 + 1.000000E-05 p80 eps for Orr-Som I.C. 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/os7000/u3_t020_n13.usr b/os7000/u3_t020_n13.usr index 3f15dcf..c91da73 100644 --- a/os7000/u3_t020_n13.usr +++ b/os7000/u3_t020_n13.usr @@ -182,8 +182,6 @@ c----------------------------------------------------------------------- include 'SIZE' include 'TOTAL' - param(66) = 4 - param(67) = 4 x0 = 0 x1 = 2*pi diff --git a/peris/peris.rea b/peris/peris.rea index ff2e1f6..d9523a4 100644 --- a/peris/peris.rea +++ b/peris/peris.rea @@ -3,7 +3,7 @@ 3 DIMENSIONAL RUN 102 PARAMETERS FOLLOW 1.000000 p01 DENSITY - 9.9999998E-03 p02 VISCOS + 1.0000000E-02 p02 VISCOS 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 1000.000 p11 NSTEPS - -9.9999998E-03 p12 DT + -1.0000000E-02 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 50.00000 p15 IOSTEP @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE + 1.0000000E-05 p21 DIVERGENCE 1.0000000E-07 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/peris/peris.usr b/peris/peris.usr index 1386287..44e9def 100644 --- a/peris/peris.usr +++ b/peris/peris.usr @@ -124,8 +124,6 @@ c----------------------------------------------------------------------- include 'TOTAL' param(59) = 1 ! all elements deformed - param(66) = 4 - param(67) = 4 ifxyo = .true. ifusermv = .true. ! define our own mesh velocity diff --git a/pipe/helix.rea b/pipe/helix.rea index bc68c3d..09fa948 100644 --- a/pipe/helix.rea +++ b/pipe/helix.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 40000.00 p11 NSTEPS - -2.4999999E-03 p12 DT + -2.5000000E-03 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 400.0000 p15 IOSTEP @@ -25,8 +25,8 @@ 1.0000000E-06 p21 DIVERGENCE 1.0000000E-07 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -104,7 +104,7 @@ 0.0000000E+00 p100 reserved 0.0000000E+00 p101 No. of additional filter modes 0.0000000E+00 - 9.9999998E-03 p103 weight of stabilizing filter (.01) + 1.0000000E-02 p103 weight of stabilizing filter (.01) 4 Lines of passive scalar data follows2 CONDUCT; 2RHOCP 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 diff --git a/pipe/stenosis.rea b/pipe/stenosis.rea index 809d917..5ceac69 100644 --- a/pipe/stenosis.rea +++ b/pipe/stenosis.rea @@ -25,8 +25,8 @@ 1.0000000E-06 p21 DIVERGENCE 1.0000000E-07 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/rayleigh/ray0.rea b/rayleigh/ray0.rea index bf92544..faf61ec 100644 --- a/rayleigh/ray0.rea +++ b/rayleigh/ray0.rea @@ -76,8 +76,8 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 - 0.0000000E+00 + 0. p75 epsilon for RB criticality (in .usr) + 1750. p76 Rayleigh number (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/rayleigh/ray0.usr b/rayleigh/ray0.usr index a292fd8..758c942 100644 --- a/rayleigh/ray0.usr +++ b/rayleigh/ray0.usr @@ -178,8 +178,6 @@ c----------------------------------------------------------------------- call rayleigh_const - param(66) = 4 - param(67) = 4 return end diff --git a/rayleigh/ray1.rea b/rayleigh/ray1.rea index bf92544..faf61ec 100644 --- a/rayleigh/ray1.rea +++ b/rayleigh/ray1.rea @@ -76,8 +76,8 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 - 0.0000000E+00 + 0. p75 epsilon for RB criticality (in .usr) + 1750. p76 Rayleigh number (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/rayleigh/ray2.rea b/rayleigh/ray2.rea index bb841eb..97fd9a8 100644 --- a/rayleigh/ray2.rea +++ b/rayleigh/ray2.rea @@ -76,8 +76,8 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 p74 verbose Helmholtz - 0.0000000E+00 - 0.0000000E+00 + 0. p75 epsilon for RB criticality (in .usr) + 1750. p76 Rayleigh number (in .usr) 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/robin/robin.rea b/robin/robin.rea index 1d73901..cc649f1 100644 --- a/robin/robin.rea +++ b/robin/robin.rea @@ -13,7 +13,7 @@ 0.0000000E+00 0.0000000E+00 p10 FINTIME 2000.000 p11 NSTEPS - -4.9999999E-03 p12 DT + -5.0000000E-03 p12 DT 0.0000000E+00 p13 IOCOMM 0.0000000E+00 p14 IOTIME 0.0000000E+00 p15 IOSTEP @@ -23,7 +23,7 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-10 p24 TOLREL 1.0000000E-10 p25 TOLABS diff --git a/shear4/shear4.rea b/shear4/shear4.rea index 8172b54..c95cc62 100644 --- a/shear4/shear4.rea +++ b/shear4/shear4.rea @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-07 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 1.0000000E-09 p22 HELMHOLTZ 3.000000 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/shear4/shear4.usr b/shear4/shear4.usr index 9f88493..6c1a368 100644 --- a/shear4/shear4.usr +++ b/shear4/shear4.usr @@ -199,8 +199,6 @@ c----------------------------------------------------------------------- subroutine usrdat2 include 'SIZE' include 'TOTAL' - param(66) = 4 ! std nek io - param(67) = 4 return end c----------------------------------------------------------------------- diff --git a/shear4/thin.rea b/shear4/thin.rea index 8e2e403..f0d3d40 100644 --- a/shear4/thin.rea +++ b/shear4/thin.rea @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-07 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 1.0000000E-09 p22 HELMHOLTZ 3.000000 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/shear4/thin.usr b/shear4/thin.usr index 6296482..57bdf2c 100644 --- a/shear4/thin.usr +++ b/shear4/thin.usr @@ -201,8 +201,6 @@ c----------------------------------------------------------------------- include 'SIZE' include 'TOTAL' - param(66) = 4 ! std nek io - param(67) = 4 ! ! Checking for fast tensor product pressure solver: diff --git a/solid/solid.rea b/solid/solid.rea index a011029..bf8c6f9 100644 --- a/solid/solid.rea +++ b/solid/solid.rea @@ -23,7 +23,7 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-10 p24 TOLREL 1.0000000E-10 p25 TOLABS diff --git a/solid/solid.usr b/solid/solid.usr index 46cc1a8..e7a8acd 100644 --- a/solid/solid.usr +++ b/solid/solid.usr @@ -179,8 +179,6 @@ c----------------------------------------------------------------------- real nu, lambda - param(66) = 4. ! These give the std nek binary i/o and are - param(67) = 4. ! good default values ifPlaneStress=.false. diff --git a/strat/re10f1000p0001.rea b/strat/re10f1000p0001.rea index c16fc1f..d9026f9 100644 --- a/strat/re10f1000p0001.rea +++ b/strat/re10f1000p0001.rea @@ -5,7 +5,7 @@ 1.000000 p01 DENSITY 0.1000000 p02 VISCOS 0.0000000E+00 - 0.0000000E+00 + 1.000000E-03 p04 Froude^2 0.0000000E+00 0.0000000E+00 0.0000000E+00 @@ -23,7 +23,7 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-06 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 1.0000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-10 p24 TOLREL 1.0000000E-10 p25 TOLABS diff --git a/strat/re10f1000p1000.rea b/strat/re10f1000p1000.rea index 77a9668..a7fc9e1 100644 --- a/strat/re10f1000p1000.rea +++ b/strat/re10f1000p1000.rea @@ -5,11 +5,11 @@ 1.000000 p01 DENSITY 0.1000000 p02 VISCOS 0.0000000E+00 + 1.000000E-03 p04 Froude^2 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 0.0000000E+00 - 9.9999997E-05 p08 CONDUCT + 1.0000000E-04 p08 CONDUCT 0.0000000E+00 0.0000000E+00 p10 FINTIME 16000.00 p11 NSTEPS @@ -23,7 +23,7 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-06 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 1.0000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-10 p24 TOLREL 1.0000000E-10 p25 TOLABS diff --git a/taylor/taylor.rea b/taylor/taylor.rea index 818c4a6..63efefd 100644 --- a/taylor/taylor.rea +++ b/taylor/taylor.rea @@ -25,8 +25,8 @@ 0.0000000E+00 p21 DIVERGENCE 0.0000000E+00 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999997E-06 p24 TOLREL - 9.9999997E-06 p25 TOLABS + 1.0000000E-05 p24 TOLREL + 1.0000000E-05 p25 TOLABS 2.010000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) @@ -124,7 +124,7 @@ 8.0632000E+00 p120 1.8879000E-02 p121 1.0095000E-02 p122 - 9.9999997E-05 p123 + 1.0000000E-04 p123 4 Lines of passive scalar data follows2 CONDUCT; 2RHOCP 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 diff --git a/thermal_io/recirc.rea b/thermal_io/recirc.rea index 54cac94..349e79c 100644 --- a/thermal_io/recirc.rea +++ b/thermal_io/recirc.rea @@ -22,7 +22,7 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE + 1.0000000E-05 p21 DIVERGENCE 1.0000000E-07 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL 1.0000000E-03 p24 TOLREL diff --git a/thermal_io/recirc.usr b/thermal_io/recirc.usr index 203ccf8..2ffc95c 100644 --- a/thermal_io/recirc.usr +++ b/thermal_io/recirc.usr @@ -143,8 +143,6 @@ c----------------------------------------------------------------------- include 'SIZE' include 'TOTAL' - param(66) = 4. ! These give the std nek binary i/o and are - param(67) = 4. ! good default values return end diff --git a/timing/timing.rea b/timing/timing.rea index 0e39be7..430efe0 100644 --- a/timing/timing.rea +++ b/timing/timing.rea @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-05 p21 DIVERGENCE + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/turbChannel/base.rea b/turbChannel/base.rea index ea74acd..20315b2 100644 --- a/turbChannel/base.rea +++ b/turbChannel/base.rea @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-05 p21 DIVERGENCE + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/turbChannel/turbChannel.rea b/turbChannel/turbChannel.rea index 0e39be7..430efe0 100644 --- a/turbChannel/turbChannel.rea +++ b/turbChannel/turbChannel.rea @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-05 p21 DIVERGENCE + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/turbJet/jet.rea b/turbJet/jet.rea index 0e39be7..430efe0 100644 --- a/turbJet/jet.rea +++ b/turbJet/jet.rea @@ -22,11 +22,11 @@ 0.0000000E+00 0.0000000E+00 0.0000000E+00 - 9.9999997E-06 p21 DIVERGENCE - 9.9999999E-09 p22 HELMHOLTZ + 1.0000000E-05 p21 DIVERGENCE + 1.0000000E-08 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 3.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/var_vis/st2.rea b/var_vis/st2.rea index 367f8e7..86cdbfd 100644 --- a/var_vis/st2.rea +++ b/var_vis/st2.rea @@ -3,7 +3,7 @@ 2 DIMENSIONAL RUN 103 PARAMETERS FOLLOW 1.000000 p01 DENSITY - 9.9999998E-03 p02 VISCOS + 1.0000000E-02 p02 VISCOS 0.0000000E+00 0.0000000E+00 0.0000000E+00 diff --git a/var_vis/st2.usr b/var_vis/st2.usr index 6ca0ee5..b7f4511 100644 --- a/var_vis/st2.usr +++ b/var_vis/st2.usr @@ -94,8 +94,6 @@ c----------------------------------------------------------------------- include 'TOTAL' integer e - param(66) = 4 - param(67) = 4 return end diff --git a/vortex/r1854a.rea b/vortex/r1854a.rea index 08f3825..1e59105 100644 --- a/vortex/r1854a.rea +++ b/vortex/r1854a.rea @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-07 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 1.0000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 9.9999998E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 1.0000000E-02 p24 TOLREL + 1.0000900E-02 p25 TOLABS 1.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/vortex/r1854a.usr b/vortex/r1854a.usr index c4570a0..8693044 100644 --- a/vortex/r1854a.usr +++ b/vortex/r1854a.usr @@ -146,8 +146,6 @@ c----------------------------------------------------------------------- common /bcdata/ zstart ! start of top layer of elements - param(66) = 4. ! These give the std nek binary i/o and are - param(67) = 4. ! good default values zstart = 0 diff --git a/vortex2/v2d.rea b/vortex2/v2d.rea index 6425cec..02c11c1 100644 --- a/vortex2/v2d.rea +++ b/vortex2/v2d.rea @@ -23,10 +23,10 @@ 0.0000000E+00 0.0000000E+00 1.0000000E-07 p21 DIVERGENCE - 9.9999997E-10 p22 HELMHOLTZ + 8.0000000E-09 p22 HELMHOLTZ 0.0000000E+00 p23 NPSCAL - 4.9999999E-03 p24 TOLREL - 9.9999998E-03 p25 TOLABS + 5.0000000E-03 p24 TOLREL + 1.0000000E-02 p25 TOLABS 2.000000 p26 COURANT/NTAU 2.000000 p27 TORDER 0.0000000E+00 p28 TORDER: mesh velocity (0: p28=p27) diff --git a/vortex2/v2d.usr b/vortex2/v2d.usr index 6e1d705..f0193b8 100644 --- a/vortex2/v2d.usr +++ b/vortex2/v2d.usr @@ -151,8 +151,6 @@ c----------------------------------------------------------------------- include 'SIZE' include 'TOTAL' - param(66) = 4. ! These give the std nek binary i/o and are - param(67) = 4. ! good default values return end