Skip to content

Commit

Permalink
Merge branch 'beta' of https://github.com/QSD-Group/QSDsan
Browse files Browse the repository at this point in the history
  • Loading branch information
@yalinli2
yalinli2 committed Oct 18, 2023
2 parents 1a940bd + 82a1d82 commit 9e4ae7a
Show file tree
Hide file tree
Showing 23 changed files with 2,710 additions and 448 deletions.
1 change: 0 additions & 1 deletion docs/source/api/sanunits/_index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Individual Unit Operations
CropApplication
DynamicInfluent
ElectrochemicalCell
encapsulation_bioreactor
Excretion
Flash
heat_exchanging
Expand Down
4 changes: 0 additions & 4 deletions docs/source/api/sanunits/encapsulation_bioreactor.rst
View file

This file was deleted.

2 changes: 1 addition & 1 deletion docs/source/tutorials/0_Quick_Overview.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"\n",
"- **Prepared by:**\n",
" \n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/authors/Yalin_Li.html)\n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" \n",
"To run tutorials in your browser, go to this [Binder page](https://mybinder.org/v2/gh/QSD-Group/QSDsan/main?filepath=%2Fdocs%2Fsource%2Ftutorials)."
]
Expand Down
37 changes: 33 additions & 4 deletions docs/source/tutorials/10_Process.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"\n",
"- **Prepared by:**\n",
" \n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/authors/Joy_Zhang.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" \n",
"- **Covered topics:**\n",
"\n",
Expand Down Expand Up @@ -3001,9 +3001,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python [conda env:tut]",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "conda-env-tut-py"
"name": "python3"
},
"language_info": {
"codemirror_mode": {
Expand All @@ -3015,7 +3015,36 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.0"
"version": "3.9.13"
},
"varInspector": {
"cols": {
"lenName": 16,
"lenType": 16,
"lenVar": 40
},
"kernels_config": {
"python": {
"delete_cmd_postfix": "",
"delete_cmd_prefix": "del ",
"library": "var_list.py",
"varRefreshCmd": "print(var_dic_list())"
},
"r": {
"delete_cmd_postfix": ") ",
"delete_cmd_prefix": "rm(",
"library": "var_list.r",
"varRefreshCmd": "cat(var_dic_list()) "
}
},
"types_to_exclude": [
"module",
"function",
"builtin_function_or_method",
"instance",
"_Feature"
],
"window_display": false
}
},
"nbformat": 4,
Expand Down
37 changes: 33 additions & 4 deletions docs/source/tutorials/11_Dynamic_Simulation.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"\n",
"- **Prepared by:**\n",
" \n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/authors/Joy_Zhang.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" \n",
"- **Covered topics:**\n",
"\n",
Expand Down Expand Up @@ -2168,9 +2168,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python [conda env:tut]",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "conda-env-tut-py"
"name": "python3"
},
"language_info": {
"codemirror_mode": {
Expand All @@ -2182,7 +2182,36 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.0"
"version": "3.9.13"
},
"varInspector": {
"cols": {
"lenName": 16,
"lenType": 16,
"lenVar": 40
},
"kernels_config": {
"python": {
"delete_cmd_postfix": "",
"delete_cmd_prefix": "del ",
"library": "var_list.py",
"varRefreshCmd": "print(var_dic_list())"
},
"r": {
"delete_cmd_postfix": ") ",
"delete_cmd_prefix": "rm(",
"library": "var_list.r",
"varRefreshCmd": "cat(var_dic_list()) "
}
},
"types_to_exclude": [
"module",
"function",
"builtin_function_or_method",
"instance",
"_Feature"
],
"window_display": false
}
},
"nbformat": 4,
Expand Down
2,297 changes: 2,297 additions & 0 deletions docs/source/tutorials/12_Anaerobic_Digestion_Model_No_1.ipynb
View file

Large diffs are not rendered by default.

37 changes: 33 additions & 4 deletions docs/source/tutorials/1_Helpful_Basics.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"\n",
"- **Prepared by:**\n",
" \n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/authors/Yalin_Li.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/authors/Joy_Zhang.html)\n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" \n",
"- **Covered topics:**\n",
"\n",
Expand All @@ -19,7 +19,7 @@
" \n",
"- **Video demo:**\n",
"\n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/authors/Yalin_Li.html)\n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" \n",
"To run tutorials in your browser, go to this [Binder page](https://mybinder.org/v2/gh/QSD-Group/QSDsan/main?filepath=%2Fdocs%2Fsource%2Ftutorials).\n",
" \n",
Expand Down Expand Up @@ -690,7 +690,36 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.12"
"version": "3.9.13"
},
"varInspector": {
"cols": {
"lenName": 16,
"lenType": 16,
"lenVar": 40
},
"kernels_config": {
"python": {
"delete_cmd_postfix": "",
"delete_cmd_prefix": "del ",
"library": "var_list.py",
"varRefreshCmd": "print(var_dic_list())"
},
"r": {
"delete_cmd_postfix": ") ",
"delete_cmd_prefix": "rm(",
"library": "var_list.r",
"varRefreshCmd": "cat(var_dic_list()) "
}
},
"types_to_exclude": [
"module",
"function",
"builtin_function_or_method",
"instance",
"_Feature"
],
"window_display": false
}
},
"nbformat": 4,
Expand Down
33 changes: 31 additions & 2 deletions docs/source/tutorials/2_Component.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"\n",
"- **Prepared by:**\n",
" \n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/authors/Yalin_Li.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/authors/Joy_Zhang.html)\n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
"\n",
"- **Covered topics:**\n",
"\n",
Expand Down Expand Up @@ -1575,6 +1575,35 @@
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.13"
},
"varInspector": {
"cols": {
"lenName": 16,
"lenType": 16,
"lenVar": 40
},
"kernels_config": {
"python": {
"delete_cmd_postfix": "",
"delete_cmd_prefix": "del ",
"library": "var_list.py",
"varRefreshCmd": "print(var_dic_list())"
},
"r": {
"delete_cmd_postfix": ") ",
"delete_cmd_prefix": "rm(",
"library": "var_list.r",
"varRefreshCmd": "cat(var_dic_list()) "
}
},
"types_to_exclude": [
"module",
"function",
"builtin_function_or_method",
"instance",
"_Feature"
],
"window_display": false
}
},
"nbformat": 4,
Expand Down
35 changes: 32 additions & 3 deletions docs/source/tutorials/3_WasteStream.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"\n",
"- **Prepared by:**\n",
" \n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/authors/Yalin_Li.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/authors/Joy_Zhang.html)\n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
"\n",
"- **Covered topics:**\n",
"\n",
Expand Down Expand Up @@ -1012,7 +1012,36 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.12"
"version": "3.9.13"
},
"varInspector": {
"cols": {
"lenName": 16,
"lenType": 16,
"lenVar": 40
},
"kernels_config": {
"python": {
"delete_cmd_postfix": "",
"delete_cmd_prefix": "del ",
"library": "var_list.py",
"varRefreshCmd": "print(var_dic_list())"
},
"r": {
"delete_cmd_postfix": ") ",
"delete_cmd_prefix": "rm(",
"library": "var_list.r",
"varRefreshCmd": "cat(var_dic_list()) "
}
},
"types_to_exclude": [
"module",
"function",
"builtin_function_or_method",
"instance",
"_Feature"
],
"window_display": false
}
},
"nbformat": 4,
Expand Down
33 changes: 31 additions & 2 deletions docs/source/tutorials/4_SanUnit_basic.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"\n",
"- **Prepared by:**\n",
" \n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/authors/Yalin_Li.html)\n",
" - [Yalin Li](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
"\n",
"- **Covered topics:**\n",
"\n",
Expand All @@ -17,7 +17,7 @@
" \n",
"- **Video demo:**\n",
"\n",
" - [Tori Morgan](https://qsdsan.readthedocs.io/en/latest/authors/Tori_Morgan.html)\n",
" - [Tori Morgan](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" \n",
"To run tutorials in your browser, go to this [Binder page](https://mybinder.org/v2/gh/QSD-Group/QSDsan/main?filepath=%2Fdocs%2Fsource%2Ftutorials).\n",
"\n",
Expand Down Expand Up @@ -1113,6 +1113,35 @@
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.13"
},
"varInspector": {
"cols": {
"lenName": 16,
"lenType": 16,
"lenVar": 40
},
"kernels_config": {
"python": {
"delete_cmd_postfix": "",
"delete_cmd_prefix": "del ",
"library": "var_list.py",
"varRefreshCmd": "print(var_dic_list())"
},
"r": {
"delete_cmd_postfix": ") ",
"delete_cmd_prefix": "rm(",
"library": "var_list.r",
"varRefreshCmd": "cat(var_dic_list()) "
}
},
"types_to_exclude": [
"module",
"function",
"builtin_function_or_method",
"instance",
"_Feature"
],
"window_display": false
}
},
"nbformat": 4,
Expand Down
Loading

0 comments on commit 9e4ae7a

Please sign in to comment.