Rex Zhe Li 86a1bb81a1 resolve merge conflict

2020-08-28 21:58:29 -04:00

..

ColorModel.cpp

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

2020-06-24 13:49:11 -04:00

ColorModel.h

fix failed merge

2020-03-17 21:44:45 -04:00

DFHModel.cpp

fix failed merge

2020-03-17 21:44:45 -04:00

DFHModel.h

fix failed merge

2020-03-17 21:44:45 -04:00

GreyscaleModel.cpp

fix sumReduce

2020-04-02 10:43:10 -04:00

GreyscaleModel.h

enabling endpoint adaptation for color model

2020-04-02 12:53:54 -04:00

IonModel.cpp

fix miscellaneous bugs and update the data structure of electric potential

2020-08-28 11:15:55 -04:00

IonModel.h

fix miscellaneous bugs and update the data structure of electric potential

2020-08-28 11:15:55 -04:00

MRTModel.cpp

add reflection BC to MRT / Color

2020-04-03 09:52:23 -04:00

MRTModel.h

fix failed merge

2020-03-17 21:44:45 -04:00

MultiPhysController.cpp

save the work;CPU version compiled; to be tested

2020-08-16 11:20:11 -04:00

MultiPhysController.h

save the work;CPU version compiled; to be tested

2020-08-16 11:20:11 -04:00

PoissonSolver.cpp

resolve merge conflict

2020-08-28 21:58:29 -04:00

PoissonSolver.h

fix poisson solver for unit test

2020-08-28 13:37:36 -04:00

StokesModel.cpp

fix miscellaneous bugs and update the data structure of electric potential

2020-08-28 11:15:55 -04:00

StokesModel.h

fix miscellaneous bugs and update the data structure of electric potential

2020-08-28 11:15:55 -04:00