diff --git a/examples/USER/sph/cavity_flow/cavity_flow.lmp b/examples/USER/sph/cavity_flow/cavity_flow.lmp index 3348c42b98..5c1517687f 100644 --- a/examples/USER/sph/cavity_flow/cavity_flow.lmp +++ b/examples/USER/sph/cavity_flow/cavity_flow.lmp @@ -28,7 +28,7 @@ group integrate_full union fluid driver mass 3 2.0e-7 mass 2 2.0e-7 mass 1 4.0e-7 -set group all meso_rho 1000.0 +set group all meso/rho 1000.0 # use Tait's EOS in combination with Morris' laminar viscosity. # We set rho_0 = 1000 kg/m^3, c = 0.1 m/s, h = 6.5e-5 m. @@ -37,8 +37,8 @@ pair_style hybrid sph/taitwater/morris pair_coeff * * sph/taitwater/morris 1000 0.1 1.0e-3 6.5e-5 pair_coeff 2 3 none # exclude interaction between walls and shear driver -compute rho_peratom all meso_rho/atom -compute e_peratom all meso_e/atom +compute rho_peratom all meso/rho/atom +compute e_peratom all meso/e/atom compute ke_peratom all ke/atom compute esph all reduce sum c_e_peratom compute ke all ke diff --git a/examples/USER/sph/heatconduction/sph_heat_conduction_2d.lmp b/examples/USER/sph/heatconduction/sph_heat_conduction_2d.lmp index 2538a2fabd..808646059f 100644 --- a/examples/USER/sph/heatconduction/sph_heat_conduction_2d.lmp +++ b/examples/USER/sph/heatconduction/sph_heat_conduction_2d.lmp @@ -17,16 +17,16 @@ mass 1 1.0e-5 region left block EDGE 49.9 EDGE EDGE EDGE EDGE region right block 50 EDGE EDGE EDGE EDGE EDGE -set region left meso_e 1.0 # internal energies -set region right meso_e 2.0 -set group all meso_rho 0.1 # mesoscopic density is also needed for this pair style +set region left meso/e 1.0 # internal energies +set region right meso/e 2.0 +set group all meso/rho 0.1 # mesoscopic density is also needed for this pair style # For correct temperature profiles, mescoscopic density and mass * number density must coincide! pair_style sph/heatconduction # i j diffusion coeff. cutoff pair_coeff 1 1 1.0e-4 2.0e-2 -compute ie_atom all meso_e/atom +compute ie_atom all meso/e/atom compute ie all reduce sum c_ie_atom thermo 10 diff --git a/examples/USER/sph/heatconduction/sph_heat_conduction_3d.lmp b/examples/USER/sph/heatconduction/sph_heat_conduction_3d.lmp index f34cc054c2..fc6fa07457 100644 --- a/examples/USER/sph/heatconduction/sph_heat_conduction_3d.lmp +++ b/examples/USER/sph/heatconduction/sph_heat_conduction_3d.lmp @@ -17,9 +17,9 @@ mass 1 1.0e-5 region left block EDGE 49.9 EDGE EDGE EDGE EDGE region right block 50 EDGE EDGE EDGE EDGE EDGE -set region left meso_e 1.0 # internal energies -set region right meso_e 2.0 -set group all meso_rho 10.0 # mesoscopic density is also needed for this pair style +set region left meso/e 1.0 # internal energies +set region right meso/e 2.0 +set group all meso/rho 10.0 # mesoscopic density is also needed for this pair style # For correct temperature profiles, mescoscopic density and mass * number density must coincide! pair_style sph/heatconduction @@ -28,7 +28,7 @@ pair_coeff 1 1 1.0e-4 2.0e-2 neighbor 0.2e-2 bin neigh_modify every 20 delay 0 check no -compute ie_atom all meso_e/atom +compute ie_atom all meso/e/atom compute ie all reduce sum c_ie_atom thermo_style custom step temp c_ie diff --git a/examples/USER/sph/shock_tube/shock2d.lmp b/examples/USER/sph/shock_tube/shock2d.lmp index 70eb4039c6..bd67362ca9 100755 --- a/examples/USER/sph/shock_tube/shock2d.lmp +++ b/examples/USER/sph/shock_tube/shock2d.lmp @@ -13,17 +13,17 @@ set region right type 2 mass 1 1 mass 2 0.25 -set type 1 meso_e 2.5 # internal energy corresponding to p=1, rho=1 -set type 2 meso_e 0.625 # internal energy corresponding to p=0.25, rho=0.25 -set type 1 meso_rho 1.0 -set type 2 meso_rho 0.25 +set type 1 meso/e 2.5 # internal energy corresponding to p=1, rho=1 +set type 2 meso/e 0.625 # internal energy corresponding to p=0.25, rho=0.25 +set type 1 meso/rho 1.0 +set type 2 meso/rho 0.25 pair_style hybrid/overlay sph/rhosum 1 sph/idealgas pair_coeff * * sph/rhosum 4.0 pair_coeff * * sph/idealgas 0.75 4.0 -compute rhoatom all meso_rho/atom -compute ieatom all meso_e/atom +compute rhoatom all meso/rho/atom +compute ieatom all meso/e/atom compute emeso all reduce sum c_ieatom # total internal energy compute ke all ke variable etot equal c_ke+c_emeso # total energy diff --git a/examples/USER/sph/shock_tube/shock3d.lmp b/examples/USER/sph/shock_tube/shock3d.lmp index 22a3710e3d..2da892d836 100644 --- a/examples/USER/sph/shock_tube/shock3d.lmp +++ b/examples/USER/sph/shock_tube/shock3d.lmp @@ -12,17 +12,17 @@ set region right type 2 mass 1 1 mass 2 0.25 -set type 1 meso_e 2.5 # internal energy corresponding to p=1, rho=1 -set type 2 meso_e 0.625 # internal energy corresponding to p=0.25, rho=0.25 -set type 1 meso_rho 1.0 -set type 2 meso_rho 0.25 +set type 1 meso/e 2.5 # internal energy corresponding to p=1, rho=1 +set type 2 meso/e 0.625 # internal energy corresponding to p=0.25, rho=0.25 +set type 1 meso/rho 1.0 +set type 2 meso/rho 0.25 pair_style hybrid/overlay sph/rhosum 1 sph/idealgas pair_coeff * * sph/rhosum 4.0 pair_coeff * * sph/idealgas 0.75 4.0 -compute rhoatom all meso_rho/atom -compute ieatom all meso_e/atom +compute rhoatom all meso/rho/atom +compute ieatom all meso/e/atom compute emeso all reduce sum c_ieatom # total internal energy compute ke all ke variable etot equal c_ke+c_emeso # total energy diff --git a/examples/USER/sph/water_collapse/water_collapse.lmp b/examples/USER/sph/water_collapse/water_collapse.lmp index 46182835db..5e1359dae5 100644 --- a/examples/USER/sph/water_collapse/water_collapse.lmp +++ b/examples/USER/sph/water_collapse/water_collapse.lmp @@ -22,8 +22,8 @@ pair_coeff 1 1 sph/rhosum ${h} fix gfix water gravity -9.81 vector 0 1 0 # add gravity. This fix also computes potential energy of mass in gravity field. fix 2d_fix all enforce2d -compute rho_peratom all meso_rho/atom -compute e_peratom all meso_e/atom +compute rho_peratom all meso/rho/atom +compute e_peratom all meso/e/atom compute esph all reduce sum c_e_peratom compute ke all ke variable etot equal c_esph+c_ke+f_gfix