Commit Graph

4234 Commits

Author SHA1 Message Date
James E. McClure
fac681dffe
Rc 08.15.2022 (#70)
* summit configure

* add spock scripts to FOM

* get new models to build with hip

* add hip slipping bc

* testing communication on spock

* update spock build based on olcf docs

* update configure & test scripts for spock

* Fixing potential bugs with communication

* Adding simple test of GPU aware MPI

* some changes to configure for spock

* Modifying GPU aware MPI test to send multiple messages

* playing with spock Gpu test

* added gpu wrapper test

* Cleaning up some compiler warnings

* add barrier between pack / MPI send

* Updating build to support HIP as a language

* fixing gpu mpi sync

* Adding script

* local spock changes

* add membrane class

* update membrane structure

* membrane communications

* working on new comm data structures

* add membrane unit test

* membrane compiles

* membrane test

* Updating hip port to match cuda

* update summit config

* update summit config

* add configure script for crusher

* update membrane test

* update membrane test

* convention for inside / outside membrane link direction

* working on membrane comm

* try to fix time conversion factor for Poisson solver; to be built and tested

* fix dumb typo

* update summit config

* tune launch for crusher

* tune launch for mrt on crusher

* update color

* summit script with specific module versions

* update crusher config

* add crusher examples

* add dense case for crusher

* Fixing some quick annoying compile warnings

* fix binding in example

* working on fix

* Adding simple crusher test

* Adding new crusher MPI test

* disable MPI thread multiple for crusher

* updates to crusher configure

* cpu test for crusher

* Working on standalone reproducer for MPI bug

* More work on creating standalone test

* More work on creating standalone test

* More work on creating standalone test

* Reverting TestCrusher2, standalone version passes (TestCrusher3.cpp), need to figure out why

* Working on standalone MPI test on crusher

* Working on standalone MPI test on crusher

* Getting closer to stand alone test

* Still trying to create standalone reproducer

* hang fix / workaround

* Created standalone MPI failure test

* Removing TestCrusher tests, the bug deals with the StackTrace which we disable the multistack trace for now.  Moving the test out of LBPM

* fix sendcount / recvcount

* Testing persistent communication

* Updating calculation of bandwidth

* crusher hackathon final version

* working on membrane communication structures

* add cell simulator

* added cell simulator

* make sure halo is filled when measuring object

* add membrane transport function for d3q7

* add membrane unpack function

* poking at MF issue

* update crusher build

* membrane data structures compiling

* update to membrane capability

* update comments in ion model

* fix dumb print bug

* clean up relabel

* adding membrane functions

* move membrane to common folder

* membrane structure in IonModel

* membrane structure in IonModel

* try at membrane simulator

* add python script to generate bubble

* add python script to generate bubble

* cell simulator runs

* read input files

* add single cell example

* refining cell example

* start on cuda function

* werkin

* start on cuda function

* start on hip function

* updates and fix for user input reader

* update cell example

* add sigmoid to ion equilibrium dist

* cuda build succeeds

* update crusher script

* getting ready to merge gpu

* refactor compact AA routines for testing

* add testing functions to ScaLBL

* testing membrane ion transport

* membrane transport test passing

* membrane starts working ok...

* original wang poisson solver (broken)

* rex d3q19 (broken)

* tau from wang paper

* still broken wang

* d319 poisson works good

* Poisson working pretty good now

* initialize nernst-planck simulator; to be built subject to debugging

* fix a few syntax bugs and build passed

* Poisson solver; enable specifying initial values

* update cell example

* add GPU functions for d3q19 poisson

* fix dumb bugs

* fix bugs in initializing electric potential; the Psi on solid was accidentally overwritten before.

* small change

* fix bugs in importing ion model's dummy velocity

* add membrane concentration init

* remove bad warnings

* remove print staetements

* add barriers to poisson solver

* update print

* print membrane input concentration

* read Membrane ion concentration list

* fix bad ref to D3Q7

* update error analysis for Poisson solver

* fix typo

* update hip poisson solver

* deprecate old error methods

* a bunch of summit debug things to roll back later

* fix poisson typo

* update hip

* debug crusher

* debug charge density problems on crusher

* fix charge density (i think)

* remove Stokes solver from cell simulator; need to test build

* update cpu ion valence

* added membrane properties to input db

* update cell db

* update executable list and NP_cell simulator

* correct use_membrane functionality

* add functionality for user to choose either D3Q7 or D3Q19 lattice for Poisson;to be built and tested

* build passed

* make further corrections

* correct D3Q7 Poisson LB algorithm

* correct ion LB collison

* udpate output precision

* add more tweaks for cell simulator

* update print-out

* this makes mpi hang error explicit;to be debugged

* cleanup with help from valgrind

* update to cell vis routine

* add hip for ion update

* fix missing bracket

* add new ion code for cuda

* add barrier to membrane transport

* debug gpu launch issue for ion

* debug gpu

* add functions to copy send / recv list from ScaLBL

* updating membrane communication structure

* membrane test works with new comm

* communication seems to work

* add sample files for plane membrane

* update gpu routines first try

* update hip

* multiple nvidia gpu working with membrane

* added membrane analysis capability

* added support for swc file

* support for SWC input format

* swc reader works with MPI

* shift swc data

* SWC reader update

* SWC reader update 2

* add offset to Domain for swc

* add input files for simple bacteria

* add performance counters to ion / poisson solvers

* fix bug with SWC

* add BC to poisson solver

* fix compiler warnings

* fix memory leaks

* fix zlib download path

* Fixing memory leak

* Fixing memory leaks

* restart for Poisson model

* fix bug in ion model restart

* trying to fix yaml

* fix workflow indentation

* porosity factor in effperm

* porosity factor in effperm

* porosity factor in effperm

* porosity factor in effperm

Co-authored-by: James E McClure <mcclurej@vt.edu>
Co-authored-by: Mark Berrill <berrillma@ornl.gov>
Co-authored-by: Zhe Rex Li <zhe.rex.li@gmail.com>
Co-authored-by: Zhe Li <zzl109@gadi-login-01.gadi.nci.org.au>
Co-authored-by: Zhe Li <zzl109@gadi-login-04.gadi.nci.org.au>
Co-authored-by: Zhe Li <zzl109@gadi-login-02.gadi.nci.org.au>
Co-authored-by: Zhe Li <zzl109@gadi-login-06.gadi.nci.org.au>
Co-authored-by: Zhe Li <zzl109@gadi-login-05.gadi.nci.org.au>
2022-09-07 21:44:16 +02:00
James McClure
75240ef7cd Merge branch 'master' of github.com:OPM/LBPM 2022-03-29 15:02:01 -04:00
James McClure
f5fdba8458 fix broken zlib download path 2022-03-29 15:01:43 -04:00
JamesEMcClure
68dd158689
Merge pull request #64 from thomaram/adjust_perm
Add perm converter
2022-03-29 04:49:27 -04:00
Thomas Ramstad
24f069c43f Add perm converter
Convert from micron2 to mDarcy

 Changes to be committed:
	modified:   models/ColorModel.cpp
	modified:   models/ColorModel.h
	modified:   models/MRTModel.cpp
2022-03-24 23:39:46 +01:00
JamesEMcClure
70b12830cb
Merge pull request #63 from thomaram/adjust_perm
Add adjusted perms
2022-03-21 14:16:13 -04:00
Thomas Ramstad
766dfc299a Correct typo
Mask->Porosity()

	modified:   models/ColorModel.cpp
	modified:   models/MRTModel.cpp
2022-03-18 18:51:21 +01:00
Thomas Ramstad
2a5df51bb2 Add adjusted perms
Updated the SCAL.csv with eff-perm values weighted with porosity to make them closer
to measure data.

Added column in Permeability.csv with the adjusted values.

	modified:   models/ColorModel.cpp
	modified:   models/MRTModel.cpp
2022-03-18 17:04:18 +01:00
trams@equinor.com
fe2496ebdd Add film corrected eff perms
modified:   models/ColorModel.cpp
2022-03-18 14:54:47 +01:00
James McClure
eccebcd95a Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2022-01-28 06:43:00 -05:00
James McClure
1e4a68aab9 add film term to scal.csv 2022-01-28 06:42:52 -05:00
Zhe Rex Li
ea90e9f875 Merge branch 'master' into slipping_vel_debug 2022-01-28 16:29:30 +11:00
Li Rex
71fdedaa2f clean up code for the updated slipping vel BC 2022-01-28 16:26:34 +11:00
Li Rex
02932e26c5 update slipping vel bc also in HIP version 2022-01-27 16:49:05 +11:00
Li Rex
d811727958 udpate cuda with corrected slipping vel BC 2022-01-27 14:44:41 +11:00
James McClure
f49b281d29 add initial radius option to morphdrain 2022-01-26 12:41:58 -05:00
Rex Zhe Li
169a102f6c fix a few typos and bug and build passed 2022-01-18 01:15:35 -05:00
Rex Zhe Li
ee527a42cc update Poisson and Stoke solvers to include slipping velocity BC; to be built 2022-01-18 16:46:09 +11:00
James McClure
07b8f9ba36 update arden script 2022-01-13 11:18:34 -05:00
James McClure
35bea97b2e update morph test based on critical radius adjustment 2022-01-12 16:07:59 -05:00
James McClure
30e0a4e24b fix bug in morphopen 2022-01-12 14:31:12 -05:00
James McClure
ce8498a9ce add pubs 2021-12-25 18:06:04 -05:00
James McClure
f93a4d3bba update to greyscale 2021-12-24 11:52:54 -05:00
James E McClure
5b33e96984 update build script for summit 2021-12-21 15:49:11 -05:00
James E McClure
7523114937 merge color profiling 2021-12-21 11:38:16 -05:00
James McClure
bb4ce1aa09 fix string with gcc 10.2 2021-12-16 20:35:06 -05:00
James McClure
3297fd04f6 example cuda - hip conversion 2021-12-16 14:18:30 -05:00
James McClure
5c3a149ab6 add droplet input file 2021-12-16 12:07:16 -05:00
James McClure
5c794e0bd0 fix sign on geodesic curvature 2021-12-15 07:35:10 -05:00
James McClure
d259434e5f fix compiler warning 2021-12-14 16:47:27 -05:00
James McClure
66be77aeae update deficit curvature test 2021-12-14 16:46:00 -05:00
James McClure
012c1814c6 contact angle + deficit curvature tools 2021-12-14 07:07:27 -05:00
James McClure
011b2f8a87 added analysis tools for TwoPhase object 2021-12-13 16:04:20 -05:00
James McClure
93f99057bb added droplet examples 2021-12-13 11:02:17 -05:00
James McClure
fb99e78815 add docx 2021-12-12 13:16:01 -05:00
James McClure
499b765d64 Merge branch 'master' into opm 2021-12-12 11:42:44 -05:00
James McClure
bb51c75692 update sample script 2021-12-12 11:42:32 -05:00
James McClure
44a7653c60 checkout right color model 2021-12-10 12:19:08 -05:00
James McClure
90c3513e09 fix merge 2021-12-09 15:38:54 -05:00
James McClure
f0042bafea update ubuntu sample script 2021-12-09 14:02:32 -05:00
James McClure
ba67d29e5c fix memory leak 2021-12-09 14:01:27 -05:00
James McClure
51ada19b06 merging conflicts 2021-12-09 13:51:35 -05:00
James McClure
ee93851281 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2021-12-09 10:17:13 -05:00
James McClure
a65ceef7d5 try 2 2021-12-09 10:16:47 -05:00
James McClure
44965c17f3 fix merge 2021-12-09 10:11:05 -05:00
Rex Zhe Li
d61cb8571f fix dumb typo 2021-12-06 00:46:44 -05:00
Rex Zhe Li
ba88a78afb update periodic potential BC for inlet and outlet;to be built and tested 2021-12-06 16:28:08 +11:00
Rex Zhe Li
8fce93fc47 update solid BCs of Poisson solver in GPU;to be built and tested 2021-12-06 13:50:17 +11:00
JamesEMcClure
8800066c06
Add "SCAL.csv" file for color model (#61)
* add scal file

* SCAL csv file

* Update ColorModel.cpp

Updated the SCAL output file, and removed some entries.

Co-authored-by: Thomas Ramstad <trams@equinor.com>
2021-12-03 14:53:36 +01:00
Rex Zhe Li
95d01c4e28 fix bug 2021-12-02 07:47:49 -05:00