Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
c80c5f7
fix fwrite of orientation vec
rheiland Jul 28, 2022
187d94a
prevent a segfault
rheiland Aug 3, 2022
a08c15e
Added inheritance mechanism to intracellular class
vincent-noel Aug 23, 2022
db8233c
Update PhysiCell_pathology.cpp
drbergman Sep 5, 2022
e3558e4
3x3x3 voxels sequential values
rheiland Oct 19, 2022
c7cce3c
nuke it from orbit -- the only way to be sure
MathCancer Feb 20, 2023
dac6d4e
preparing 1.11.0 release
MathCancer Feb 20, 2023
8925a74
preparing readme for improved CSV parsing, new signals, and user proj…
MathCancer Feb 21, 2023
87a68d5
update biorobots sample
MathCancer Feb 21, 2023
13ca095
Update VERSION.txt
MathCancer Feb 21, 2023
d8c68af
update signals and bheaviors
MathCancer Feb 21, 2023
81f3a5f
Merge branch 'dev-paul' of https://github.com/MathCancer/PhysiCell in…
MathCancer Feb 21, 2023
cc5d0d6
updated CSV format
MathCancer Feb 21, 2023
120cdec
Update adding new signals or behaviors.md
MathCancer Feb 21, 2023
ff527f8
Update README.md
MathCancer Feb 21, 2023
18d2761
bugfixes
MathCancer Feb 21, 2023
688c1fa
converted heterogeneity sample project
MathCancer Feb 21, 2023
168b51d
fix heterogeneity config file
MathCancer Feb 21, 2023
aaad43c
fix boundary condition in heterogeniety
MathCancer Feb 21, 2023
0dfa4f8
fixing more bugs in xml file for heterogeneity.
MathCancer Feb 21, 2023
e0ba190
tidying up, and backing up heterogeneity to h2
MathCancer Feb 21, 2023
7e17661
udpated cancer biorobots
MathCancer Feb 22, 2023
386f8b7
Update README.md
MathCancer Feb 23, 2023
20097e9
updating cancer biorobots sample project
MathCancer Feb 23, 2023
9826fee
Merge branch 'dev-paul' of https://github.com/MathCancer/PhysiCell in…
MathCancer Feb 23, 2023
6cd58f9
Update README.md
MathCancer Feb 23, 2023
de9ff45
Update README.md
MathCancer Feb 23, 2023
80a1609
update attack model to use immunogenicity
MathCancer Feb 23, 2023
94fd247
Merge branch 'dev-paul' of https://github.com/MathCancer/PhysiCell in…
MathCancer Feb 23, 2023
020b877
updating new immunogenicity signals and behaviors
MathCancer Feb 27, 2023
a471ded
3D cancer immune ; simple interpolation
MathCancer Feb 28, 2023
535c3c7
update version to 1.11.0-beta
MathCancer Feb 28, 2023
309eb44
clearer definitino
MathCancer Feb 28, 2023
caed0f3
Update README.md
MathCancer Mar 1, 2023
3d3c10a
move beta support for loading matlab ICs to BioFVM_MultiCellDS
MathCancer Mar 1, 2023
342bd05
Merge branch 'dev-paul' of https://github.com/MathCancer/PhysiCell in…
MathCancer Mar 1, 2023
a93bcaa
Update README.md
MathCancer Mar 1, 2023
3fded5c
Update .gitignore
MathCancer Mar 1, 2023
59c1203
Update README.md
MathCancer Mar 1, 2023
b6e3d93
fix calcification bug from issue 133
MathCancer Mar 1, 2023
16063ce
Merge branch 'dev-paul' of https://github.com/MathCancer/PhysiCell in…
MathCancer Mar 1, 2023
e9a76f0
a
MathCancer Mar 2, 2023
68a8fbe
working ...
MathCancer Mar 12, 2023
1fc24de
working on behaviors
MathCancer Mar 12, 2023
876b116
added new behaviors
MathCancer Mar 12, 2023
e584fce
void dynamic_attachments( Cell* pCell , Phenotype& phenotype, double …
MathCancer Mar 12, 2023
7dcd826
Update README.md
MathCancer Mar 12, 2023
864c725
Update README.md
MathCancer Mar 12, 2023
306d1e5
fix stadnard model for dynamic attachments
MathCancer Mar 12, 2023
137fd45
mechano example
MathCancer Mar 12, 2023
d1fe853
better parameters
MathCancer Mar 12, 2023
a4df7a6
more sample cell csv files
MathCancer Mar 13, 2023
06fc831
additional CSV files for mechano project
MathCancer Mar 14, 2023
75a2a7e
light cleanup
MathCancer Mar 14, 2023
5b84481
bertter cell coloring
MathCancer Mar 14, 2023
da719fd
cleanup
MathCancer Mar 14, 2023
6ec010f
bundled mechano sample project
MathCancer Mar 14, 2023
112a733
clenaup after mechano test
MathCancer Mar 14, 2023
8922863
Update README.md
MathCancer Mar 14, 2023
a4ea2b4
Update README.md
MathCancer Mar 14, 2023
6019321
Update README.md
MathCancer Mar 14, 2023
1b8306d
Update README.md
MathCancer Mar 14, 2023
74defc6
Update README.md
MathCancer Mar 14, 2023
868bdbd
Update README.md
MathCancer Mar 14, 2023
fa709c0
Update README.md
MathCancer Mar 14, 2023
e703d52
Update README.md
MathCancer Mar 14, 2023
e233672
cleaned out user projects
MathCancer Mar 14, 2023
aad29c6
option to disable automated springs
MathCancer Mar 14, 2023
54ff746
Update README.md
MathCancer Mar 14, 2023
46e6d4b
Update README.md
MathCancer Mar 14, 2023
510884f
Update README.md
MathCancer Mar 14, 2023
70f9f8a
Update README.md
MathCancer Mar 14, 2023
5c2ef1c
Update README.md
MathCancer Mar 14, 2023
23085cb
Update README.md
MathCancer Mar 14, 2023
2e5a099
Update README.md
MathCancer Mar 14, 2023
3cddb9a
Update README.md
MathCancer Mar 14, 2023
63e7506
upate sampel projects to avoid surprises
MathCancer Mar 14, 2023
acd04e6
udpate sampel projects
MathCancer Mar 14, 2023
1255650
Checking if parameter exist, otherwise exiting
vincent-noel Mar 15, 2023
2066a8a
fixing necrosis parameters
MathCancer Mar 16, 2023
f1edef1
fix necrosis parameters
MathCancer Mar 16, 2023
1553904
fixed necrosis parameters
MathCancer Mar 16, 2023
b436862
fix necrosis settings
MathCancer Mar 16, 2023
b497c85
Update PhysiCell_settings.xml
MathCancer Mar 16, 2023
e62e4f2
fix necrosis parameters
MathCancer Mar 16, 2023
1ef7923
cleanup
MathCancer Mar 16, 2023
87bcdb3
Initializing the intracellular model at cell creation
vincent-noel Mar 13, 2023
136c327
Making sure cells are in the domain and initialized before running in…
vincent-noel Mar 13, 2023
57d840d
Check if there is an intracellular model before trying to export data
vincent-noel Jul 24, 2022
585724d
Initializing list and dict in constructors
vincent-noel Jul 27, 2022
a0f42d5
Added check for node existence when getting/setting node value
vincent-noel Oct 25, 2022
ddc5bc0
Parsing MaBoSS models now an OpenMP critical block
vincent-noel Oct 27, 2022
296d3c2
Now always using mersenne twister (std::mt19937) as random generator …
vincent-noel Nov 17, 2022
f904f35
Setting a variable with libMaBoSS version in setup_libmaboss
vincent-noel Oct 17, 2022
375cb30
Updated MaBoSS version to 2.5.2
vincent-noel Jan 25, 2023
2f8c7ba
Added option to start intracellular model later in the simulation
vincent-noel Jul 27, 2022
9c0a454
Added printing of start time for PhysiBoSS
vincent-noel Mar 6, 2023
d64a84c
Mapping now using std::map, avoiding duplicates
vincent-noel Mar 2, 2023
84ea4ed
Implemented PhysiBoSS state inheritance : global, and node-specific
vincent-noel Mar 13, 2023
d332621
Added xml copy and legend creation to physiboss cell lines example
vincent-noel Mar 13, 2023
28482d0
Properly replacing mappings which already exist
vincent-noel Mar 13, 2023
b0fc221
Simplified custom code for physiboss_cell_lines, now using csv positi…
vincent-noel Mar 13, 2023
65d4538
Updated Makefile : Now MaBoSS dependency work with parallel build, ad…
vincent-noel Mar 13, 2023
3c01701
Cleanup debugging comment
vincent-noel Mar 15, 2023
d322644
Added option to disable automated spring adhesions
vincent-noel Mar 16, 2023
8b4a7b7
Removing all inheritance between cell definitions in PhysiBoSS. BND a…
vincent-noel Mar 16, 2023
bb59e0c
Returned to original physiboss cell lines example
vincent-noel Mar 16, 2023
8aeb823
Tagged PhysiBoSS_Version as 2.2.0
vincent-noel Mar 16, 2023
bc0d2ca
backups
MathCancer Mar 17, 2023
504f9dd
Merge branch 'development' into dev-paul
MathCancer Mar 17, 2023
87b0f8f
Merge pull request #143 from MathCancer/dev-paul
MathCancer Mar 17, 2023
8e5b65b
Delete biorobots
MathCancer Mar 17, 2023
a625c71
Merge branch 'development' into update/physiboss_2.2.0
vincent-noel Mar 17, 2023
a7a9e50
Updated CA cartificates
vincent-noel Mar 17, 2023
a944d82
Merge pull request #126 from drbergman/patch-1
MathCancer Mar 17, 2023
453cd4d
Update README.md
MathCancer Mar 17, 2023
6bd5faf
Update PhysiCell_settings.cpp
MathCancer Mar 17, 2023
81fdff6
Update README.md
MathCancer Mar 17, 2023
ef881df
Update README.md
MathCancer Mar 17, 2023
814cc85
Merge pull request #122 from rheiland/development
MathCancer Mar 17, 2023
16af158
Merge pull request #144 from sysbio-curie/update/physiboss_2.2.0
MathCancer Mar 17, 2023
48d152d
Adding parsing of svg substrate plotting options
Oct 6, 2022
3eefb6c
Adding code for plotting substrate in SVGs
Oct 6, 2022
b93b241
Adding example of substrate plotting in SGVs in interactions project
Oct 6, 2022
564c389
added plot bar legend for the visualization of the substrate in the S…
Nov 2, 2022
33eccd9
modified argument of the svg_plot function as optional, so it will be…
Mar 17, 2023
2d35a38
Added boolean attribute in the XML to activate limits in substrate pl…
vincent-noel Mar 17, 2023
b61e37d
Renamed ECM_coloring_function -> substrate_coloring_function
vincent-noel Mar 17, 2023
8f596be
Now using a separate XML file for the substrate plotting in SVG examp…
vincent-noel Mar 17, 2023
186334f
Updated XML settings in interactions
vincent-noel Mar 17, 2023
b31cd48
Renamed custom substrate coloring function
vincent-noel Mar 17, 2023
ef172a2
Restored default value of enable_SVG_saves
vincent-noel Mar 17, 2023
2a52174
Merge pull request #129 from sysbio-curie/feat/svg_substrate
MathCancer Mar 17, 2023
9852d2c
update makefile for cancer-biorobots sample project
MathCancer Mar 17, 2023
7c19e2f
bugfixes
MathCancer Mar 18, 2023
652d0df
add mechano
rheiland Mar 19, 2023
c330e41
Merge pull request #147 from rheiland/development
MathCancer Mar 20, 2023
d32323f
Update README.md
MathCancer Mar 20, 2023
9650009
Merge pull request #145 from sysbio-curie/fix/parameter_exists
MathCancer Mar 20, 2023
7d7823d
small bugfix
MathCancer Mar 20, 2023
f7ec7b5
Merge branch 'development' of https://github.com/MathCancer/PhysiCell…
MathCancer Mar 20, 2023
70d0ddd
Update README.md
MathCancer Mar 20, 2023
b42c6f6
Update README.md
MathCancer Mar 20, 2023
63ecf69
cleanup
MathCancer Mar 20, 2023
adfa506
update readme and changes for 1.11.0 release
MathCancer Mar 20, 2023
5b05792
Create changes-compact.md
MathCancer Mar 20, 2023
c5a357d
Update changes-compact.md
MathCancer Mar 20, 2023
8e704b2
Update changes-compact.md
MathCancer Mar 20, 2023
3bd780a
md files
MathCancer Mar 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- uses: msys2/setup-msys2@v2
with:
update: true
install: base-devel flex bison gcc make diffutils mingw-w64-x86_64-toolchain
install: base-devel flex bison gcc make diffutils mingw-w64-x86_64-toolchain mingw-w64-x86_64-ca-certificates

- name: Build Virus Macrophage project
run: |
make virus-macrophage-sample
Expand Down
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,14 @@ sample_projects/cancer_biorobots/.DS_Store
sample_projects/cancer_immune/.DS_Store
sample_projects/celltypes3/.DS_Store
sample_projects/heterogeneity/.DS_Store
sample_projects/template/.DS_Store
sample_projects/template/.DS_Store
pmb_debug.log
heterogeneity
**/.DS_Store
**/._.DS_Store
cancer_immune_3D
biorobots
project
initial.svg
initial.svg
interaction_demo
44 changes: 44 additions & 0 deletions BioFVM/BioFVM_MultiCellDS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1387,4 +1387,48 @@ void read_microenvironment_from_MultiCellDS_xml( Microenvironment& M_destination
return;
}

bool read_microenvironment_from_matlab( std::string mat_filename )
{
std::cout << std::endl << "Attempting to load the microenvironment from " << mat_filename << " ... " << std::endl;

std::vector< std::vector<double> > mat = read_matlab( mat_filename );

// row 0 : x
// row 1 : y
// row 2 : z
// row 3 : vol
// row 4-n : substrate
int num_rows = mat.size();
int num_cols = mat[0].size();

int number_of_mat_voxels = num_cols;
int number_of_mat_substrates = num_rows - 3 -1;

if( number_of_mat_substrates != microenvironment.number_of_densities() )
{
std::cout << "Error reading microenvironment from " << mat_filename << "! ";
std::cout << "Expected " << microenvironment.number_of_densities() << " substrates but only detected "
<< number_of_mat_substrates << std::endl;
return false;
}

if( number_of_mat_voxels != microenvironment.number_of_voxels() )
{
std::cout << "Error reading microenvironment from " << mat_filename << "! ";
std::cout << "Expected " << microenvironment.number_of_voxels() << " voxels but only detected "
<< number_of_mat_voxels << std::endl;
return false;
}

for( int n=0 ; n < number_of_mat_voxels ; n++ )
{
// std::cout << microenvironment.mesh.voxels[n].center << " vs " << mat[0][n] << " " << mat[1][n] << " " << mat[2][n] << std::endl;
for( int k=4; k < num_rows ; k++ )
{ microenvironment(n)[k-4] = mat[k][n]; }
}

std::cout << "done!" << std::endl << std::endl;
return true;
}

};
4 changes: 4 additions & 0 deletions BioFVM/BioFVM_MultiCellDS.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ void add_BioFVM_to_open_xml_pugi( pugi::xml_document& xml_dom , std::string file

void save_BioFVM_to_MultiCellDS_xml_pugi( std::string filename_base , Microenvironment& M , double current_simulation_time);

/* beta in PhysiCell 1.11.0 */

bool read_microenvironment_from_matlab( std::string mat_filename );

/* future / not yet supported */

void read_BioFVM_from_open_xml_pugi( pugi::xml_document& xml_dom , std::string filename_base, double& current_simulation_time , Microenvironment& M );
Expand Down
4 changes: 2 additions & 2 deletions CITATION.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
If you use PhysiCell in your project, please cite PhysiCell and the version
number, such as below:

We implemented and solved the model using PhysiCell (Version 1.10.4) [1].
We implemented and solved the model using PhysiCell (Version 1.11.0) [1].

[1] A Ghaffarizadeh, R Heiland, SH Friedman, SM Mumenthaler, and P Macklin,
PhysiCell: an Open Source Physics-Based Cell Simulator for Multicellu-
Expand All @@ -11,7 +11,7 @@ We implemented and solved the model using PhysiCell (Version 1.10.4) [1].
Because PhysiCell extensively uses BioFVM, we suggest you also cite BioFVM
as below:

We implemented and solved the model using PhysiCell (Version 1.10.4) [1],
We implemented and solved the model using PhysiCell (Version 1.11.0) [1],
with BioFVM [2] to solve the transport equations.

[1] A Ghaffarizadeh, R Heiland, SH Friedman, SM Mumenthaler, and P Macklin,
Expand Down
37 changes: 33 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ name:
list-projects:
@echo "Sample projects: template biorobots-sample cancer-biorobots-sample cancer-immune-sample"
@echo " celltypes3-sample heterogeneity-sample pred-prey-farmer virus-macrophage-sample"
@echo " worm-sample interaction-sample"
@echo " worm-sample interaction-sample mechano-sample"
@echo ""
@echo "Sample intracellular projects: ode-energy-sample physiboss-cell-lines-sample cancer-metabolism-sample"
@echo ""
Expand All @@ -93,7 +93,7 @@ template:
biorobots-sample:
cp ./sample_projects/biorobots/custom_modules/* ./custom_modules/
touch main.cpp && cp main.cpp main-backup.cpp
cp ./sample_projects/biorobots/main-biorobots.cpp ./main.cpp
cp ./sample_projects/biorobots/main.cpp ./main.cpp
cp Makefile Makefile-backup
cp ./sample_projects/biorobots/Makefile .
cp ./config/PhysiCell_settings.xml ./config/PhysiCell_settings-backup.xml
Expand All @@ -102,7 +102,7 @@ biorobots-sample:
cancer-biorobots-sample:
cp ./sample_projects/cancer_biorobots/custom_modules/* ./custom_modules/
touch main.cpp && cp main.cpp main-backup.cpp
cp ./sample_projects/cancer_biorobots/main-cancer_biorobots.cpp ./main.cpp
cp ./sample_projects/cancer_biorobots/main.cpp ./main.cpp
cp Makefile Makefile-backup
cp ./sample_projects/cancer_biorobots/Makefile .
cp ./config/PhysiCell_settings.xml ./config/PhysiCell_settings-backup.xml
Expand All @@ -129,7 +129,7 @@ celltypes3-sample:
heterogeneity-sample:
cp ./sample_projects/heterogeneity/custom_modules/* ./custom_modules/
touch main.cpp && cp main.cpp main-backup.cpp
cp ./sample_projects/heterogeneity/main-heterogeneity.cpp ./main.cpp
cp ./sample_projects/heterogeneity/main.cpp ./main.cpp
cp Makefile Makefile-backup
cp ./sample_projects/heterogeneity/Makefile .
cp ./config/PhysiCell_settings.xml ./config/PhysiCell_settings-backup.xml
Expand Down Expand Up @@ -208,6 +208,13 @@ cancer-metabolism-sample:
cp ./config/PhysiCell_settings.xml ./config/PhysiCell_settings-backup.xml
cp ./sample_projects_intracellular/fba/cancer_metabolism/config/* ./config/

mechano-sample:
cp ./sample_projects/mechano/custom_modules/* ./custom_modules/
touch main.cpp && cp main.cpp main-backup.cpp
cp ./sample_projects/mechano/main.cpp ./main.cpp
cp Makefile Makefile-backup
cp ./sample_projects/mechano/Makefile .
cp ./sample_projects/mechano/config/* ./config/

# early examples for convergence testing

Expand Down Expand Up @@ -422,3 +429,25 @@ upgrade: $(SOURCE)
mv -f PhysiCell/documentation/User_Guide.pdf documentation
rm -f -r PhysiCell
rm -f $(SOURCE)

# use: make save PROJ=your_project_name
PROJ := my_project

save:
echo "Saving project as $(PROJ) ... "
mkdir -p ./user_projects
mkdir -p ./user_projects/$(PROJ)
mkdir -p ./user_projects/$(PROJ)/custom_modules
mkdir -p ./user_projects/$(PROJ)/config
cp main.cpp ./user_projects/$(PROJ)
cp Makefile ./user_projects/$(PROJ)
cp VERSION.txt ./user_projects/$(PROJ)
cp ./config/* ./user_projects/$(PROJ)/config
cp ./custom_modules/* ./user_projects/$(PROJ)/custom_modules

load:
echo "Loading project from $(PROJ) ... "
cp ./user_projects/$(PROJ)/main.cpp .
cp ./user_projects/$(PROJ)/Makefile .
cp ./user_projects/$(PROJ)/config/* ./config/
cp ./user_projects/$(PROJ)/custom_modules/* ./custom_modules/
Loading