lp:~esys-p-dev/esys-particle/esys-darcy

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:esys-particle at revision 1202

Dion Weatherley: Approve on 2019-07-28

Diff: 13423 lines (+8253/-737) (has conflicts)

55 files modified

Doc/ESyS-Darcy/examples/seepage/input.geo (+522/-0)
Doc/ESyS-Darcy/examples/seepage/run.sh (+17/-0)
Doc/ESyS-Darcy/examples/seepage/upward_seepage.py (+204/-0)
Fields/FieldMaster.cpp (+28/-2)
Fields/FieldMaster.h (+8/-1)
Fields/FluidFieldMaster.cpp (+566/-0)
Fields/FluidFieldMaster.h (+106/-0)
Fields/FluidInteractionFieldMaster.cpp (+695/-0)
Fields/FluidInteractionFieldMaster.h (+124/-0)
Fields/Makefile.am (+13/-1)
Fields/ScalarFluidFieldSlave.h (+51/-0)
Fields/ScalarFluidFieldSlave.hpp (+121/-0)
Fields/ScalarFluidInteractionFieldSlave.h (+55/-0)
Fields/ScalarFluidInteractionFieldSlave.hpp (+176/-0)
Fields/VectorFluidFieldSlave.h (+47/-0)
Fields/VectorFluidFieldSlave.hpp (+54/-0)
Fields/VectorFluidInteractionFieldSlave.h (+54/-0)
Fields/VectorFluidInteractionFieldSlave.hpp (+160/-0)
Fields/field_const.h (+14/-2)
Model/FluidCell.cpp (+145/-0)
Model/FluidCell.h (+133/-0)
Model/FluidInteraction.cpp (+99/-0)
Model/FluidInteraction.h (+72/-0)
Model/Makefile.am (+5/-1)
Parallel/ASubLattice.h (+21/-5)
Parallel/GMRESSolverMaster.cpp (+143/-0)
Parallel/GMRESSolverMaster.h (+81/-0)
Parallel/GMRESSolverSlave.cpp (+573/-0)
Parallel/GMRESSolverSlave.h (+76/-0)
Parallel/LatticeMaster.cpp (+657/-199)
Parallel/LatticeMaster.h (+55/-28)
Parallel/Makefile.am (+8/-0)
Parallel/SubLattice.h (+34/-8)
Parallel/SubLattice.hpp (+487/-205)
Parallel/SubLatticeControler.cpp (+41/-28)
Parallel/sublattice_cmd.h (+23/-2)
Python/esys/lsm/ExportModuleLsm.cpp (+4/-0)
Python/esys/lsm/FluidFieldSaverPrmsPy.cpp (+148/-0)
Python/esys/lsm/FluidFieldSaverPrmsPy.h (+60/-0)
Python/esys/lsm/FluidInteractionFieldSaverPrmsPy.cpp (+147/-0)
Python/esys/lsm/FluidInteractionFieldSaverPrmsPy.h (+61/-0)
Python/esys/lsm/LsmMpiPy.cpp (+257/-65)
Python/esys/lsm/LsmMpiPy.h (+26/-9)
Python/esys/lsm/Makefile.am (+5/-1)
Tools/ExtractStrain/DataExtractor.cpp (+2/-2)
Tools/ExtractStrain/DataExtractor.h (+1/-1)
Tools/ExtractStrain/main.cpp (+1/-1)
ntable/src/ntable.h (+72/-14)
ntable/src/ntable.hpp (+1092/-49)
pis/Makefile.am (+2/-1)
pis/pi_storage_f.h (+78/-0)
pis/pi_storage_f.hpp (+196/-0)
ppa/src/pp_array.h (+47/-16)
ppa/src/pp_array.hpp (+290/-95)
tml/message/pack.cpp (+96/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1184. By Qi Shao on 2017-08-22

Added fluid phase and its forces on solid particles. Flows of fluid are calculated according to the Darcy's Law. The coupling of fluid and DEM is based on the poro-elastic theory.

1183. By Steffen Abe <email address hidden> on 2017-03-30

- changed deprecated MPI 1.x functions MPI_Address and MPI_Type_struct to MPI 2.0 functions MPI_Get_address and MPI_Type_create_struct

1182. By Qi Shao on 2017-02-14

Change of version number for recent release

1181. By Qi Shao on 2017-01-04

Copyright dates update

1180. By Qi Shao on 2017-01-04

Added two new interaction types: HertzMindlinInteraction and HertzMindlinViscoInteraction

1179. By Vince Boros on 2016-09-20

An attempt to clarify the issue surrounding the Automake subdir-objects
option as it affects ESyS-Particle.

1178. By Vince Boros on 2016-09-20

Build system change:
* An improvement to preventing C++ preprocessor linemarkers in CPP output

1177. By Vince Boros on 2016-09-08

Build system changes:
* prevent C++ preprocessor linemarkers in CPP output;
* update compiler versions information, to find the name of the mpic++ toolset;
* adjust the 'configure' output for more useful information;
* allow builds in the source tree with the --enable-docs option.

1176. By Vince Boros on 2016-09-06

Change of version number for recent release

1175. By Jinfang <email address hidden> on 2016-06-16

License change from OSL 3.0 to APL 2.0