zhyang-dev/LIGGGHTS-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/LIGGGHTS-PFM.git synced 2025-12-08 06:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #138 from ParticulateFlow/master

Browse Source 
Updates from release 23.02
This commit is contained in:
Daniel
2023-03-06 15:31:52 +01:00
committed by GitHub
parent 4f75bbe65c 9f7281aad2
commit 32d09abeef
7 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
examples/LIGGGHTS/PFM/segregation/brazil_nut_effect/Metzgeretal/meshes/*.stl → examples/LIGGGHTS/PFM/segregation/brazil_nut_effect/Metzgeretal/meshes/bottom.stl
View File

2
examples/LIGGGHTS/PFM/tests/chemistry/low_temp/in.liggghts_run_3layers
View File

@ -71,7 +71,7 @@ fix cfd5 all chem/shrink/core speciesA CO molMassA 0.02801 &
# chemical properties for unreacted shrinking core model
# these are actually hard-coded for low T:
# w->Fe m->w h->m
fix k0_CO all property/global k0_cfd5 vector 150 150 150
fix k0_CO all property/global k0_cfd5 vector 100 100 150
fix Ea_CO all property/global Ea_cfd5 vector 70000 70000 75000
# particle porosity/tortuosity/pore diameter

4
examples/LIGGGHTS/PFM/tests/contact_models/chung/test01/processData.m
View File

@ -35,9 +35,9 @@ for ii=1:nFiles
line = fgetl(fin); line = fgetl(fin);
line = fgetl(fin); line = fgetl(fin);
A = sscanf(line,'%f',[1 4]);
% write normal overlap (micrometer) and Force (N) to the new file
% write normal overlap (micrometer) and Force (kN) to the new file
fprintf(fout1,'%f %f\n',A(4)*1000000,-A(1)*0.001);
% write time (microseconds) and Force (N) to the new file
% write time (microseconds) and Force (kN) to the new file
fprintf(fout2,'%f %f\n',(ii-1),-A(1)*0.001);
end
fclose(fin);

4
examples/LIGGGHTS/PFM/tests/contact_models/nijssen/processData.m
View File

@ -36,9 +36,9 @@ for ii=1:nFiles
line = fgetl(fin); line = fgetl(fin);
A = sscanf(line,'%f',[1 4]);
% write normal overlap (micrometer) and Force (N) to the new file
fprintf(fout1,'%f %f\n',A(4)*1000000,A(1));
fprintf(fout1,'%f %f\n',A(4)*1000000,-A(1));
% write time (microseconds) and Force (N) to the new file
fprintf(fout2,'%f %f\n',(ii-1)*5,A(1));
fprintf(fout2,'%f %f\n',(ii-1)*5,-A(1));
end
fclose(fin);
end

32
examples/LIGGGHTS/PFM/tests/contact_models/nijssen/run.config Normal file
View File

@ -0,0 +1,32 @@
{
"runs": [
{
"name" : "lubrication",
"input_script" : "in.lubrication",
"type" : "serial",
"variables" : {
"NORMALMODEL" : "hertz/lubricated",
"TANGENTIALMODEL" : "history/lubricated",
"MODELOPTION" : "limitForce",
"MODELOPTIONSETTING" : "off"
},
"post_scripts" : ["processData.m"],
"data" : {
"series" : [
{"name" : "rebound", "file" : "hertz/lubricated_rebound_properties.txt", "columns" : ["Theta", "Stokes", "etot", "en", "et", "sigmaeff", "thetai"]},
{"name" : "displace", "file" : "force_displacement.txt", "columns" : ["deltan", "Fn"]},
{"name" : "time", "file" : "force_time.txt", "columns" : ["usec", "Fn"]}
],
"plots" : [
{"name" : "reboundetot", "title" : "Total coeff. of restitution", "xdata" : "rebound.Theta", "ydata" : ["rebound.etot"], "xlabel" : "Impact angle", "ylabel" : "e_tot", "legend" : ["etot"]},
{"name" : "rebounden", "title" : "Normal coeff. of restitution", "xdata" : "rebound.Theta", "ydata" : ["rebound.en"], "xlabel" : "Impact angle", "ylabel" : "e_n", "legend" : ["en"]},
{"name" : "reboundet", "title" : "Tangential coeff. of restitution", "xdata" : "rebound.Theta", "ydata" : ["rebound.et"], "xlabel" : "Impact angle", "ylabel" : "e_t", "legend" : ["et"]},
{"name" : "reboundsigmaeff", "title" : "Eff. rebound angle", "xdata" : "rebound.Theta", "ydata" : ["rebound.sigmaeff"], "xlabel" : "Impact angle", "ylabel" : "sigma_eff", "legend" : ["sigmaeff"]},
{"name" : "reboundthetai", "title" : "Rebound angle", "xdata" : "rebound.Theta", "ydata" : ["rebound.thetai"], "xlabel" : "Impact angle", "ylabel" : "theta_i", "legend" : ["thetai"]},
{"name" : "displacedelta", "title" : "Normal force-displacement", "xdata" : "displace.deltan", "ydata" : ["displace.Fn"], "xlabel" : "Normal contact displacement [um]", "ylabel" : "Normal contact force [N]", "legend" : ["Fn"]},
{"name" : "forcetime", "title" : "Normal force-time", "xdata" : "time.usec", "ydata" : ["time.Fn"], "xlabel" : "Time [us]", "ylabel" : "Normal contact force [N]", "legend" : ["Fn"]}
]
}
}
]
}

4
src/CMakeLists.txt
View File

@ -5,8 +5,8 @@ OPTION(USE_SUPERQUADRIC "Superquadric particles" OFF)
OPTION(USE_OPENMP "OpenMP parallelization" OFF)
OPTION(TESTING "TESTING" OFF)
SET(LIGGGHTS_MAJOR_VERSION 21)
SET(LIGGGHTS_MINOR_VERSION 11)
SET(LIGGGHTS_MAJOR_VERSION 23)
SET(LIGGGHTS_MINOR_VERSION 02)
SET(LIGGGHTS_PATCH_VERSION 0)
SET(LIGGGHTS_VERSION ${LIGGGHTS_MAJOR_VERSION}.${LIGGGHTS_MINOR_VERSION}.${LIGGGHTS_PATCH_VERSION})
MESSAGE(STATUS "${LIGGGHTS_VERSION}")

2
src/version_liggghts.txt
View File

@ -1 +1 @@
21.11
23.02