From 27d343fb966361a4e6cc99650241f651778fc50f Mon Sep 17 00:00:00 2001 From: Sepand Haghighi Date: Sat, 16 Mar 2024 19:21:16 +0330 Subject: [PATCH] Version 1.4 (#215) * rel : migrate to version 1.4 * doc : notebooks version updated * doc : notebooks run * doc : CHANGELOG.md updated * fix : minor edit in tests * fix : minor edit in tests * fix : tests fixed * doc : version 1.4 added to bug_report.yml * doc : notebooks installation section updated * doc : notebooks run * fix : minor bug in version_check.py script fixed * fix : Version.rc updated * doc : release date updated * doc : release date fixed * doc : release date fixed --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + CHANGELOG.md | 4 +- Documents/Amphlett.ipynb | 103 +++-- Documents/Amphlett/Amphlett_Test.html | 8 +- Documents/Amphlett/Amphlett_Test.opem | 2 +- Documents/Chakraborty.ipynb | 432 ++++++++++++------ Documents/Chakraborty/Chakraborty_Test.html | 8 +- Documents/Chakraborty/Chakraborty_Test.opem | 2 +- .../Chamberline-Kim/Chamberline_Test.html | 8 +- .../Chamberline-Kim/Chamberline_Test.opem | 2 +- Documents/Chamberline_Kim.ipynb | 36 +- Documents/Larminie-Dicks/Larminiee_Test.html | 8 +- Documents/Larminie-Dicks/Larminiee_Test.opem | 2 +- Documents/Larminie_Dicks.ipynb | 87 ++-- .../Padulles_Amphlett_Test.html | 8 +- .../Padulles_Amphlett_Test.opem | 2 +- .../Padulles-Hauer/Padulles_Hauer_Test.html | 8 +- .../Padulles-Hauer/Padulles_Hauer_Test.opem | 2 +- Documents/Padulles-I/PadullesI_Test.html | 8 +- Documents/Padulles-I/PadullesI_Test.opem | 2 +- Documents/Padulles-II/Padulles2_Test.html | 8 +- Documents/Padulles-II/Padulles2_Test.opem | 2 +- Documents/Padulles1.ipynb | 112 +++-- Documents/Padulles2.ipynb | 113 +++-- Documents/Padulles_Amphlett.ipynb | 129 ++++-- Documents/Padulles_Hauer.ipynb | 111 +++-- INSTALL.md | 8 +- OPEM.spec | 2 +- opem/Params.py | 2 +- otherfile/Version.rc | 10 +- otherfile/meta.yaml | 2 +- otherfile/test.html | 8 +- otherfile/test.opem | 2 +- otherfile/version_check.py | 4 +- pytest.ini | 2 +- setup.py | 4 +- test/test_Functions.py | 4 +- 37 files changed, 785 insertions(+), 471 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 1cf4244d..9416fbc6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -85,6 +85,7 @@ body: label: OPEM version description: Which version of OPEM are you using? options: + - OPEM 1.4 - OPEM 1.3 - OPEM 1.2 - OPEM 1.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d89977e..48656084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.4] - 2024-03-16 ### Added - `feature_request.yml` template - `config.yml` for issue template @@ -208,7 +209,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - CSV output files - Documents and `README.md` -[Unreleased]: https://github.com/ECSIM/opem/compare/v1.3...develop +[Unreleased]: https://github.com/ECSIM/opem/compare/v1.4...develop +[1.4]: https://github.com/ECSIM/opem/compare/v1.3...v1.4 [1.3]: https://github.com/ECSIM/opem/compare/v1.2...v1.3 [1.2]: https://github.com/ECSIM/opem/compare/v1.1...v1.2 [1.1]: https://github.com/ECSIM/opem/compare/v1.0...v1.1 diff --git a/Documents/Amphlett.ipynb b/Documents/Amphlett.ipynb index 62bb5468..fc529c81 100644 --- a/Documents/Amphlett.ipynb +++ b/Documents/Amphlett.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -2178,7 +2178,14 @@ "Eta Ohmic : 0.01868695167529925 V\n", "Loss : 0.4458626037260719 V\n", "PEM Efficiency : 0.47749192068841545 \n", - "Power : 7.672340181621459 W\n", + "Power : 7.672340181621459 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Power-Stack : 7.672340181621459 W\n", "Power-Thermal : 4.996659818378541 W\n", "VStack : 0.7448873962739281 V\n", @@ -2707,13 +2714,7 @@ "I : 14.4\n", "Enernst : 1.19075 V\n", "Eta Activation : 0.4472112941344899 V\n", - "Eta Concentration : 0.0031105272896047396 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "Eta Concentration : 0.0031105272896047396 V\n", "Eta Ohmic : 0.026535504600708918 V\n", "Loss : 0.4768573260248036 V\n", "PEM Efficiency : 0.45762350895845927 \n", @@ -3183,7 +3184,13 @@ "Eta Activation : 0.4619896340937498 V\n", "Eta Concentration : 0.00400237438056457 V\n", "Eta Ohmic : 0.033657389798262084 V\n", - "Loss : 0.4996493982725765 V\n", + "Loss : 0.4996493982725765 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PEM Efficiency : 0.44301320623552787 \n", "Power : 12.439810831093624 W\n", "Power-Stack : 12.439810831093624 W\n", @@ -4180,16 +4187,17 @@ "Vcell : 0.6498233659144583 V\n", "###########\n", "I : 25.7\n", - "Enernst : 1.19075 V\n" + "Enernst : 1.19075 V\n", + "Eta Activation : 0.4855746809174719 V\n", + "Eta Concentration : 0.0061122736732644725 V\n", + "Eta Ohmic : 0.04974462467630013 V" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "Eta Activation : 0.4855746809174719 V\n", - "Eta Concentration : 0.0061122736732644725 V\n", - "Eta Ohmic : 0.04974462467630013 V\n", + "\n", "Loss : 0.5414315792670366 V\n", "PEM Efficiency : 0.4162297568801047 \n", "Power : 16.68748341283716 W\n", @@ -5188,7 +5196,13 @@ "###########\n", "I : 33.4\n", "Enernst : 1.19075 V\n", - "Eta Activation : 0.5029307025466467 V\n", + "Eta Activation : 0.5029307025466467 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Eta Concentration : 0.008574190508184984 V\n", "Eta Ohmic : 0.06725773924082235 V\n", "Loss : 0.5787626322956541 V\n", @@ -5685,13 +5699,7 @@ "Eta Activation : 0.5100669536569448 V\n", "Eta Concentration : 0.009959049275589708 V\n", "Eta Ohmic : 0.07653881386383425 V\n", - "Loss : 0.5965648167963686 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "Loss : 0.5965648167963686 V\n", "PEM Efficiency : 0.3808879379510457 \n", "Power : 22.103688815175087 W\n", "Power-Stack : 22.103688815175087 W\n", @@ -6194,7 +6202,14 @@ "Vcell : 0.5764449190473883 V\n", "###########\n", "I : 41.1\n", - "Enernst : 1.19075 V\n", + "Enernst : 1.19075 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Eta Activation : 0.5166698379008314 V\n", "Eta Concentration : 0.011529578143815321 V\n", "Eta Ohmic : 0.08657365726924719 V\n", @@ -7191,15 +7206,15 @@ "Power : 26.289585089800685 W\n", "Power-Stack : 26.289585089800685 W\n", "Power-Thermal : 33.611414910199315 W\n", - "VStack : 0.5398272092361537 V\n" + "VStack : 0.5398272092361537 V\n", + "Vcell : 0.5398272092361537 V\n", + "###########\n" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "Vcell : 0.5398272092361537 V\n", - "###########\n", "I : 48.8\n", "Enernst : 1.19075 V\n", "Eta Activation : 0.5280426466039074 V\n", @@ -8199,7 +8214,14 @@ "Power-Stack : 28.24991348898447 W\n", "Power-Thermal : 41.12208651101553 W\n", "VStack : 0.5008849909394409 V\n", - "Vcell : 0.5008849909394409 V\n", + "Vcell : 0.5008849909394409 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "###########\n", "I : 56.5\n", "Enernst : 1.19075 V\n", @@ -8993,13 +9015,7 @@ "Power-Thermal : 47.69210471132422 W\n", "VStack : 0.46692632461881245 V\n", "Vcell : 0.46692632461881245 V\n", - "###########\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "###########\n", "I : 62.6\n", "Enernst : 1.19075 V\n", "Eta Activation : 0.5445357218305342 V\n", @@ -9204,7 +9220,13 @@ "PEM Efficiency : 0.2931490240047774 \n", "Power : 29.31372980438172 W\n", "Power-Stack : 29.31372980438172 W\n", - "Power-Thermal : 49.529270195618274 W\n", + "Power-Thermal : 49.529270195618274 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "VStack : 0.45731247744745274 V\n", "Vcell : 0.45731247744745274 V\n", "###########\n", @@ -10204,7 +10226,14 @@ "Loss : 0.7883142594819055 V\n", "PEM Efficiency : 0.25797162853724004 \n", "Power : 28.894886169199182 W\n", - "Power-Stack : 28.894886169199182 W\n", + "Power-Stack : 28.894886169199182 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Power-Thermal : 59.41911383080081 W\n", "VStack : 0.4024357405180945 V\n", "Vcell : 0.4024357405180945 V\n", @@ -10716,7 +10745,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/Documents/Amphlett/Amphlett_Test.html b/Documents/Amphlett/Amphlett_Test.html index 25c0e5eb..ac6e4ebf 100644 --- a/Documents/Amphlett/Amphlett_Test.html +++ b/Documents/Amphlett/Amphlett_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -485,6 +485,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Amphlett/Amphlett_Test.opem b/Documents/Amphlett/Amphlett_Test.opem index 49c19cb8..14e653b7 100644 --- a/Documents/Amphlett/Amphlett_Test.opem +++ b/Documents/Amphlett/Amphlett_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:09:09.457234 +Simulation Date : 2024-03-12 09:11:00.370426 ********** Amphlett Model diff --git a/Documents/Chakraborty.ipynb b/Documents/Chakraborty.ipynb index 973850e9..d5259739 100644 --- a/Documents/Chakraborty.ipynb +++ b/Documents/Chakraborty.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -1916,7 +1916,13 @@ "I : 11.9\n", "E : 1.0418855502739588 V\n", "FC Efficiency : 0.5780067380463525 \n", - "FC Power : 12.742014038547328 W\n", + "FC Power : 12.742014038547328 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "FC Voltage : 1.0707574822308679 V\n", "Nernst Gain : 0.06791880695690915 V\n", "Ohmic Loss : 0.039046875 V\n", @@ -2413,13 +2419,7 @@ "Nernst Gain : 0.07603795611962806 V\n", "Ohmic Loss : 0.0525 V\n", "PH2 : 2.458920118657944e-05 atm\n", - "PH2O : 0.00029507041423895334 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PH2O : 0.00029507041423895334 atm\n", "PO2 : 1.946862403367863e-05 atm\n", "Power-Thermal : 2.763130284306115 W\n", "###########\n", @@ -2922,7 +2922,14 @@ "FC Voltage : 1.043523107230868 V\n", "Nernst Gain : 0.08243053149217695 V\n", "Ohmic Loss : 0.06628125 V\n", - "PH2 : 3.104386649805654e-05 atm\n", + "PH2 : 3.104386649805654e-05 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PH2O : 0.0003725263979766786 atm\n", "PO2 : 2.4579137842519272e-05 atm\n", "Power-Thermal : 3.766833233936467 W\n", @@ -3921,7 +3928,13 @@ "PH2 : 4.379951461359463e-05 atm\n", "PH2O : 0.0005255941753631356 atm\n", "PO2 : 3.467848655999006e-05 atm\n", - "Power-Thermal : 6.090771131420267 W\n", + "Power-Thermal : 6.090771131420267 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "###########\n", "I : 28.6\n", "E : 1.0178375282468277 V\n", @@ -3946,13 +3959,7 @@ "PH2O : 0.0005292825555411225 atm\n", "PO2 : 3.4921844360411044e-05 atm\n", "Power-Thermal : 6.152347759974088 W\n", - "###########\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "###########\n", "I : 28.8\n", "E : 1.0176464132186884 V\n", "FC Efficiency : 0.5480725275200368 \n", @@ -4927,7 +4934,14 @@ "###########\n", "I : 36.9\n", "E : 1.0108495323092797 V\n", - "FC Efficiency : 0.5337253615281339 \n", + "FC Efficiency : 0.5337253615281339 " + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Power : 36.48399796931902 W\n", "FC Voltage : 0.9887262322308679 V\n", "Nernst Gain : 0.09895482492158819 V\n", @@ -5776,13 +5790,7 @@ "PH2O : 0.0008095994490681281 atm\n", "PO2 : 5.341703719240574e-05 atm\n", "Power-Thermal : 11.600246530064899 W\n", - "###########\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "###########\n", "I : 44.0\n", "E : 1.0060233517668546 V\n", "FC Efficiency : 0.5211494505969597 \n", @@ -5932,7 +5940,13 @@ "FC Efficiency : 0.5190239445240852 \n", "FC Power : 43.45943194683523 W\n", "FC Voltage : 0.9614918572308678 V\n", - "Nernst Gain : 0.10451893954994693 V\n", + "Nernst Gain : 0.10451893954994693 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Ohmic Loss : 0.1483125 V\n", "PH2 : 6.946449335208692e-05 atm\n", "PH2O : 0.0008335739202250432 atm\n", @@ -6932,7 +6946,14 @@ "Ohmic Loss : 0.175546875 V\n", "PH2 : 8.2220141467625e-05 atm\n", "PH2O : 0.0009866416976115002 atm\n", - "PO2 : 6.509821161261292e-05 atm\n", + "PO2 : 6.509821161261292e-05 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Power-Thermal : 15.822224700648572 W\n", "###########\n", "I : 53.6\n", @@ -7429,13 +7450,7 @@ "###########\n", "I : 57.7\n", "E : 0.9985893528055554 V\n", - "FC Efficiency : 0.4968832562649759 \n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Efficiency : 0.4968832562649759 \n", "FC Power : 53.111478599721075 W\n", "FC Voltage : 0.9204762322308678 V\n", "Nernst Gain : 0.11121500442531242 V\n", @@ -7937,7 +7952,13 @@ "PO2 : 7.51975603300837e-05 atm\n", "Power-Thermal : 19.959971973132358 W\n", "###########\n", - "I : 61.9\n", + "I : 61.9\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "E : 0.9966623971999056 V\n", "FC Efficiency : 0.4894439850099152 \n", "FC Power : 56.12441940009072 W\n", @@ -8935,15 +8956,16 @@ "###########\n", "I : 70.2\n", "E : 0.9932115738402084 V\n", - "FC Efficiency : 0.4747425680058667 \n" + "FC Efficiency : 0.4747425680058667 \n", + "FC Power : 61.73813462760693 W\n", + "FC Voltage : 0.8794606072308679 V" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "FC Power : 61.73813462760693 W\n", - "FC Voltage : 0.8794606072308679 V\n", + "\n", "Nernst Gain : 0.11659278339065952 V\n", "Ohmic Loss : 0.23034375 V\n", "PH2 : 0.0001078851202061173 atm\n", @@ -9942,7 +9964,13 @@ "FC Voltage : 0.852226232230868 V\n", "Nernst Gain : 0.11965752407348047 V\n", "Ohmic Loss : 0.257578125 V\n", - "PH2 : 0.00012064076832165539 atm\n", + "PH2 : 0.00012064076832165539 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PH2O : 0.0014476892198598645 atm\n", "PO2 : 9.551793666523578e-05 atm\n", "Power-Thermal : 29.65524076987686 W\n", @@ -10440,13 +10468,7 @@ "Power-Thermal : 32.31534134273029 W\n", "###########\n", "I : 82.7\n", - "E : 0.9887174208004104 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "E : 0.9887174208004104 V\n", "FC Efficiency : 0.45260187974675736 \n", "FC Power : 69.33940003049278 W\n", "FC Voltage : 0.8384449822308679 V\n", @@ -10948,7 +10970,14 @@ "PH2O : 0.0016007569972463216 atm\n", "PO2 : 0.00010561728538270658 atm\n", "Power-Thermal : 35.15470679236066 W\n", - "###########\n", + "###########" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "I : 86.9\n", "E : 0.9873588345251583 V\n", "FC Efficiency : 0.4451626084916966 \n", @@ -11947,7 +11976,13 @@ "###########\n", "I : 95.2\n", "E : 0.9848570831842376 V\n", - "FC Efficiency : 0.4304611914876479 \n", + "FC Efficiency : 0.4304611914876479 \n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "FC Power : 75.91527480837861 W\n", "FC Voltage : 0.7974293572308677 V\n", "Nernst Gain : 0.12494727404663021 V\n", @@ -12446,13 +12481,7 @@ "Ohmic Loss : 0.32582812499999997 V\n", "PH2 : 0.00015260672986420866 atm\n", "PH2O : 0.0018312807583705038 atm\n", - "PO2 : 0.000120827147909018 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PO2 : 0.000120827147909018 atm\n", "Power-Thermal : 44.290160139474814 W\n", "###########\n", "I : 99.4\n", @@ -12953,7 +12982,14 @@ "FC Power : 79.71518066089482 W\n", "FC Voltage : 0.7701949822308678 V\n", "Nernst Gain : 0.1272397668904091 V\n", - "Ohmic Loss : 0.339609375 V\n", + "Ohmic Loss : 0.339609375 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PH2 : 0.00015906139517568577 atm\n", "PH2O : 0.001908736742108229 atm\n", "PO2 : 0.00012593766171785866 atm\n", @@ -13952,7 +13988,13 @@ "Ohmic Loss : 0.36684374999999997 V\n", "PH2 : 0.00017181704329122385 atm\n", "PH2O : 0.002061804519494686 atm\n", - "PO2 : 0.00013603701043532942 atm\n", + "PO2 : 0.00013603701043532942 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Power-Thermal : 54.451004111588965 W\n", "###########\n", "I : 111.9\n", @@ -13981,13 +14023,7 @@ "###########\n", "I : 112.1\n", "E : 0.9803755429284204 V\n", - "FC Efficiency : 0.40052698096133227 \n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Efficiency : 0.40052698096133227 \n", "FC Power : 83.17553563308029 W\n", "FC Voltage : 0.741976232230868 V\n", "Nernst Gain : 0.12942881430244746 V\n", @@ -14958,7 +14994,14 @@ "Power-Thermal : 61.76427950907274 W\n", "###########\n", "I : 120.2\n", - "E : 0.9784622261114875 V\n", + "E : 0.9784622261114875 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Efficiency : 0.3861798149694293 \n", "FC Power : 85.99085248915031 W\n", "FC Voltage : 0.7153981072308678 V\n", @@ -16963,7 +17006,14 @@ "Nernst Gain : 0.13488989741901147 V\n", "Ohmic Loss : 0.448875 V\n", "PH2 : 0.00021023767014525426 atm\n", - "PH2O : 0.002522852041743051 atm\n", + "PH2O : 0.002522852041743051 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PO2 : 0.0001664567354879523 atm\n", "Power-Thermal : 77.84886393081727 W\n", "###########\n", @@ -18781,7 +18831,14 @@ "Nernst Gain : 0.13776134992422287 V\n", "Ohmic Loss : 0.498421875 V\n", "PH2 : 0.0002334437287650886 atm\n", - "PH2O : 0.002801324745181063 atm\n", + "PH2O : 0.002801324745181063 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PO2 : 0.0001848302494197365 atm\n", "Power-Thermal : 93.96800094913117 W\n", "###########\n", @@ -19467,7 +19524,13 @@ "PH2 : 0.0002422036316878075 atm\n", "PH2O : 0.00290644358025369 atm\n", "PO2 : 0.0001917659467317345 atm\n", - "Power-Thermal : 100.44173330041522 W\n", + "Power-Thermal : 100.44173330041522 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "###########\n", "I : 157.7\n", "E : 0.9710153393067091 V\n", @@ -19968,13 +20031,7 @@ "FC Voltage : 0.5788981072308679 V\n", "Nernst Gain : 0.1394929192981003 V\n", "Ohmic Loss : 0.53090625 V\n", - "PH2 : 0.0002486582969992846 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PH2 : 0.0002486582969992846 atm\n", "PH2O : 0.0029838995639914156 atm\n", "PO2 : 0.00019687646054057518 atm\n", "Power-Thermal : 105.34828625004558 W\n", @@ -20473,7 +20530,14 @@ "###########\n", "I : 166.0\n", "E : 0.9696086260655468 V\n", - "FC Efficiency : 0.3050563331880528 \n", + "FC Efficiency : 0.3050563331880528 " + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Power : 93.80939830032405 W\n", "FC Voltage : 0.5651168572308678 V\n", "Nernst Gain : 0.14019573116532105 V\n", @@ -21472,7 +21536,13 @@ "FC Efficiency : 0.2903549161840043 \n", "FC Power : 93.75291665284027 W\n", "FC Voltage : 0.5378824822308679 V\n", - "Nernst Gain : 0.14153379632169508 V\n", + "Nernst Gain : 0.14153379632169508 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Ohmic Loss : 0.571921875 V\n", "PH2 : 0.0002678686104262998 atm\n", "PH2O : 0.0032144233251155977 atm\n", @@ -21972,14 +22042,15 @@ "Power-Thermal : 125.87380267001315 W\n", "###########\n", "I : 178.5\n", - "E : 0.9676175563556917 V\n", - "FC Efficiency : 0.2829156449289435 \n" + "E : 0.9676175563556917 V" ] }, { "name": "stdout", "output_type": "stream", "text": [ + "\n", + "FC Efficiency : 0.2829156449289435 \n", "FC Power : 93.55206995320991 W\n", "FC Voltage : 0.5241012322308678 V\n", "Nernst Gain : 0.14218680087517616 V\n", @@ -22477,7 +22548,13 @@ "Nernst Gain : 0.14280960289161898 V\n", "Ohmic Loss : 0.59915625 V\n", "PH2 : 0.0002806242585418379 atm\n", - "PH2O : 0.0033674911025020544 atm\n", + "PH2O : 0.0033674911025020544 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PO2 : 0.00022218567178435738 atm\n", "Power-Thermal : 131.3536556196435 W\n", "###########\n", @@ -22977,7 +23054,14 @@ "E : 0.9663710969213166 V\n", "FC Efficiency : 0.26821422792489497 \n", "FC Power : 92.81472893072613 W\n", - "FC Voltage : 0.49686685723086793 V\n", + "FC Voltage : 0.49686685723086793 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Nernst Gain : 0.14343326030955134 V\n", "Ohmic Loss : 0.6129375 V\n", "PH2 : 0.000287078923853315 atm\n", @@ -23476,7 +23560,13 @@ "PH2O : 0.003520558879888512 atm\n", "PO2 : 0.0002322850205018282 atm\n", "Power-Thermal : 142.5233185171273 W\n", - "###########\n", + "###########\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "I : 191.0\n", "E : 0.9657613070494211 V\n", "FC Efficiency : 0.2607749566698342 \n", @@ -23976,16 +24066,17 @@ "FC Voltage : 0.46963248223086795 V\n", "Nernst Gain : 0.14462552259017 V\n", "Ohmic Loss : 0.640171875 V\n", - "PH2 : 0.00029983457196885305 atm\n", - "PH2O : 0.0035980148636262366 atm\n", - "PO2 : 0.00023739553431066882 atm\n", - "Power-Thermal : 148.34770271675765 W\n" + "PH2 : 0.00029983457196885305 atm" ] }, { "name": "stdout", "output_type": "stream", "text": [ + "\n", + "PH2O : 0.0035980148636262366 atm\n", + "PO2 : 0.00023739553431066882 atm\n", + "Power-Thermal : 148.34770271675765 W\n", "###########\n", "I : 195.2\n", "E : 0.9651647814015725 V\n", @@ -24801,7 +24892,14 @@ "PH2 : 0.00031028498247314936 atm\n", "PH2O : 0.0037234197896777923 atm\n", "PO2 : 0.0002456696995249822 atm\n", - "Power-Thermal : 158.02309558758776 W\n", + "Power-Thermal : 158.02309558758776 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "###########\n", "I : 202.0\n", "E : 0.9642256700607896 V\n", @@ -25481,7 +25579,14 @@ "FC Power : 88.98085956112818 W\n", "FC Voltage : 0.42861685723086795 V\n", "Nernst Gain : 0.14632863338688296 V\n", - "Ohmic Loss : 0.6811875 V\n", + "Ohmic Loss : 0.6811875 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PH2 : 0.00031904488539586827 atm\n", "PH2O : 0.003828538624750419 atm\n", "PO2 : 0.00025260539683698025 atm\n", @@ -25984,13 +26089,7 @@ "FC Efficiency : 0.22393285140667632 \n", "FC Power : 87.86218161149782 W\n", "FC Voltage : 0.4148356072308679 V\n", - "Nernst Gain : 0.14687793435032775 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "Nernst Gain : 0.14687793435032775 V\n", "Ohmic Loss : 0.69496875 V\n", "PH2 : 0.0003254995507073454 atm\n", "PH2O : 0.0039059946084881447 atm\n", @@ -26486,7 +26585,13 @@ "Ohmic Loss : 0.708421875 V\n", "PH2 : 0.0003318005335114064 atm\n", "PH2O : 0.003981606402136876 atm\n", - "PO2 : 0.00026270474555445107 atm\n", + "PO2 : 0.00026270474555445107 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Power-Thermal : 178.89852208635565 W\n", "###########\n", "I : 216.0\n", @@ -27486,7 +27591,14 @@ "Power-Thermal : 191.8819943588394 W\n", "###########\n", "I : 224.3\n", - "E : 0.9613538242904832 V\n", + "E : 0.9613538242904832 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Efficiency : 0.20179216314756704 \n", "FC Power : 83.84782201438367 W\n", "FC Voltage : 0.3738199822308679 V\n", @@ -27990,13 +28102,7 @@ "Power-Thermal : 198.62420980846977 W\n", "###########\n", "I : 228.5\n", - "E : 0.9608450439685925 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "E : 0.9608450439685925 V\n", "FC Efficiency : 0.19435289189250626 \n", "FC Power : 82.2688503147533 W\n", "FC Voltage : 0.3600387322308678 V\n", @@ -28491,7 +28597,13 @@ "E : 0.9603573188101739 V\n", "FC Efficiency : 0.1870907461435184 \n", "FC Power : 80.61581224189986 W\n", - "FC Voltage : 0.34658560723086784 V\n", + "FC Voltage : 0.34658560723086784 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Nernst Gain : 0.14944703842069387 V\n", "Ohmic Loss : 0.76321875 V\n", "PH2 : 0.00035746551224989865 atm\n", @@ -29491,7 +29603,14 @@ "Nernst Gain : 0.1504086010456495 V\n", "Ohmic Loss : 0.790453125 V\n", "PH2 : 0.0003702211603654367 atm\n", - "PH2O : 0.004442653924385241 atm\n", + "PH2O : 0.004442653924385241 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PO2 : 0.0002931244706070739 atm\n", "Power-Thermal : 219.37528815558392 W\n", "###########\n", @@ -29995,13 +30114,7 @@ "Nernst Gain : 0.15088262338689823 V\n", "Ohmic Loss : 0.804234375 V\n", "PH2 : 0.0003766758256769138 atm\n", - "PH2O : 0.004520109908122966 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PH2O : 0.004520109908122966 atm\n", "PO2 : 0.00029823498441591454 atm\n", "Power-Thermal : 226.57779735521424 W\n", "###########\n", @@ -30496,7 +30609,13 @@ "PH2O : 0.004595721701771698 atm\n", "PO2 : 0.00030322381932454466 atm\n", "Power-Thermal : 233.72047917806768 W\n", - "###########\n", + "###########\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "I : 249.3\n", "E : 0.9584557656712175 V\n", "FC Efficiency : 0.1575107866293484 \n", @@ -31496,7 +31615,14 @@ "I : 257.6\n", "E : 0.9575575728154611 V\n", "FC Efficiency : 0.14280936962529978 \n", - "FC Power : 68.14920242267156 W\n", + "FC Power : 68.14920242267156 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Voltage : 0.26455435723086784 V\n", "Nernst Gain : 0.15224678441540684 V\n", "Ohmic Loss : 0.8452500000000001 V\n", @@ -32001,13 +32127,7 @@ "E : 0.9571140338398525 V\n", "FC Efficiency : 0.13537009837023908 \n", "FC Power : 65.65239947304121 W\n", - "FC Voltage : 0.2507731072308679 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Voltage : 0.2507731072308679 V\n", "Nernst Gain : 0.15269032339101535 V\n", "Ohmic Loss : 0.85903125 V\n", "PH2 : 0.00040234080441540614 atm\n", @@ -32501,7 +32621,13 @@ "FC Power : 63.1033832751878 W\n", "FC Voltage : 0.23731998223086803 V\n", "Nernst Gain : 0.1531164910408756 V\n", - "Ohmic Loss : 0.8724843749999999 V\n", + "Ohmic Loss : 0.8724843749999999 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PH2 : 0.0004086417872194671 atm\n", "PH2O : 0.004903701446633605 atm\n", "PO2 : 0.00032354419565969677 atm\n", @@ -33241,7 +33367,13 @@ "###########\n", "I : 272.1\n", "E : 0.9560557402411303 V\n", - "FC Efficiency : 0.1171261712447329 \n", + "FC Efficiency : 0.1171261712447329 \n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "FC Power : 59.039232790019106 W\n", "FC Voltage : 0.2169762322308677 V\n", "Nernst Gain : 0.15374861698973757 V\n", @@ -34000,19 +34132,19 @@ "FC Efficiency : 0.10596726436214199 \n", "FC Power : 54.65113305307366 W\n", "FC Voltage : 0.19630435723086803 V\n", - "Nernst Gain : 0.154376353176281 V\n", - "Ohmic Loss : 0.9134999999999999 V\n", - "PH2 : 0.0004278521006464823 atm\n", - "PH2O : 0.005134225207757787 atm\n", - "PO2 : 0.0003387540581860082 atm\n", - "Power-Thermal : 287.7808669469263 W\n", - "###########\n" + "Nernst Gain : 0.154376353176281 V\n" ] }, { "name": "stdout", "output_type": "stream", "text": [ + "Ohmic Loss : 0.9134999999999999 V\n", + "PH2 : 0.0004278521006464823 atm\n", + "PH2O : 0.005134225207757787 atm\n", + "PO2 : 0.0003387540581860082 atm\n", + "Power-Thermal : 287.7808669469263 W\n", + "###########\n", "I : 278.5\n", "E : 0.9554181549269705 V\n", "FC Efficiency : 0.10579013885606907 \n", @@ -34506,7 +34638,14 @@ "Power-Thermal : 295.8195268947798 W\n", "###########\n", "I : 282.6\n", - "E : 0.955017356234929 V\n", + "E : 0.955017356234929 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Efficiency : 0.09852799310708117 \n", "FC Power : 51.581030103443254 W\n", "FC Voltage : 0.18252310723086784 V\n", @@ -35505,7 +35644,13 @@ "E : 0.9542234851711069 V\n", "FC Efficiency : 0.08382657610303268 \n", "FC Power : 45.173492205959505 W\n", - "FC Voltage : 0.15528873223086803 V\n", + "FC Voltage : 0.15528873223086803 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Nernst Gain : 0.15558087205976098 V\n", "Ohmic Loss : 0.9545156249999999 V\n", "PH2 : 0.00044706241407349746 atm\n", @@ -36012,13 +36157,7 @@ "FC Voltage : 0.14150748223086784 V\n", "Nernst Gain : 0.1559740001611261 V\n", "Ohmic Loss : 0.9682968750000001 V\n", - "PH2 : 0.0004535170793849746 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PH2 : 0.0004535170793849746 atm\n", "PH2O : 0.005442204952619696 atm\n", "PO2 : 0.00035907443452116034 atm\n", "Power-Thermal : 321.21414199367086 W\n", @@ -36511,7 +36650,14 @@ "Nernst Gain : 0.15635240788682692 V\n", "Ohmic Loss : 0.9817499999999999 V\n", "PH2 : 0.00045981806218903557 atm\n", - "PH2O : 0.005517816746268427 atm\n", + "PH2O : 0.005517816746268427 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PO2 : 0.0003640632694297904 atm\n", "Power-Thermal : 329.7021363165242 W\n", "###########\n", @@ -36689,7 +36835,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/Documents/Chakraborty/Chakraborty_Test.html b/Documents/Chakraborty/Chakraborty_Test.html index 0b5d0de9..9bd2150d 100644 --- a/Documents/Chakraborty/Chakraborty_Test.html +++ b/Documents/Chakraborty/Chakraborty_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -606,6 +606,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Chakraborty/Chakraborty_Test.opem b/Documents/Chakraborty/Chakraborty_Test.opem index 311f5cac..7164f1b0 100644 --- a/Documents/Chakraborty/Chakraborty_Test.opem +++ b/Documents/Chakraborty/Chakraborty_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:09:41.816272 +Simulation Date : 2024-03-12 09:11:14.358450 ********** Chakraborty Model diff --git a/Documents/Chamberline-Kim/Chamberline_Test.html b/Documents/Chamberline-Kim/Chamberline_Test.html index 260cbdb1..e35d5afd 100644 --- a/Documents/Chamberline-Kim/Chamberline_Test.html +++ b/Documents/Chamberline-Kim/Chamberline_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -416,6 +416,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Chamberline-Kim/Chamberline_Test.opem b/Documents/Chamberline-Kim/Chamberline_Test.opem index 84262fa6..e79d31a5 100644 --- a/Documents/Chamberline-Kim/Chamberline_Test.opem +++ b/Documents/Chamberline-Kim/Chamberline_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:10:04.745453 +Simulation Date : 2024-03-12 09:11:35.242383 ********** Chamberline-Kim Model diff --git a/Documents/Chamberline_Kim.ipynb b/Documents/Chamberline_Kim.ipynb index 5b632261..0427adae 100644 --- a/Documents/Chamberline_Kim.ipynb +++ b/Documents/Chamberline_Kim.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -1933,7 +1933,13 @@ "Vcell : 0.9217020344250522 V\n", "###########\n", "I : 18.9\n", - "PEM Efficiency : 0.5901264241012222 \n", + "PEM Efficiency : 0.5901264241012222 \n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Power : 17.399287488200436 W\n", "Power-Stack : 17.399287488200436 W\n", "Power-Thermal : 5.847712511799563 W\n", @@ -2430,13 +2436,7 @@ "###########\n", "I : 25.1\n", "PEM Efficiency : 0.5451709100424359 \n", - "Power : 21.346712153621624 W\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "Power : 21.346712153621624 W\n", "Power-Stack : 21.346712153621624 W\n", "Power-Thermal : 9.526287846378379 W\n", "VStack : 0.8504666196662001 V\n", @@ -2878,7 +2878,13 @@ "PEM Efficiency : 0.4964665088572704 \n", "Power : 23.699325266810664 W\n", "Power-Stack : 23.699325266810664 W\n", - "Power-Thermal : 13.938674733189337 W\n", + "Power-Thermal : 13.938674733189337 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "VStack : 0.7744877538173419 V\n", "Vcell : 0.7744877538173419 V\n", "###########\n", @@ -3438,7 +3444,13 @@ "PEM Efficiency : 0.386226435105954 \n", "Power : 22.65449777757484 W\n", "Power-Stack : 22.65449777757484 W\n", - "Power-Thermal : 23.593502222425162 W\n", + "Power-Thermal : 23.593502222425162 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "VStack : 0.6025132387652883 V\n", "Vcell : 0.6025132387652883 V\n", "###########\n", @@ -3930,7 +3942,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/Documents/Larminie-Dicks/Larminiee_Test.html b/Documents/Larminie-Dicks/Larminiee_Test.html index 1a24bc07..13601f7c 100644 --- a/Documents/Larminie-Dicks/Larminiee_Test.html +++ b/Documents/Larminie-Dicks/Larminiee_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -417,6 +417,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Larminie-Dicks/Larminiee_Test.opem b/Documents/Larminie-Dicks/Larminiee_Test.opem index 62e3e038..98e457f3 100644 --- a/Documents/Larminie-Dicks/Larminiee_Test.opem +++ b/Documents/Larminie-Dicks/Larminiee_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:10:27.341066 +Simulation Date : 2024-03-12 09:11:46.289849 ********** Larminie-Dicks Model diff --git a/Documents/Larminie_Dicks.ipynb b/Documents/Larminie_Dicks.ipynb index 0c167a04..ff53ee98 100644 --- a/Documents/Larminie_Dicks.ipynb +++ b/Documents/Larminie_Dicks.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -1893,7 +1893,13 @@ "Vcell : 0.6668944987275531 V\n", "###########\n", "I : 18.0\n", - "PEM Efficiency : 0.42715845145032855 \n", + "PEM Efficiency : 0.42715845145032855 \n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Power : 11.994609316725224 W\n", "Power-Stack : 275.87601428468014 W\n", "Power-Thermal : 233.3439857153198 W\n", @@ -2390,13 +2396,7 @@ "###########\n", "I : 24.2\n", "PEM Efficiency : 0.40803058381004037 \n", - "Power : 15.403970599996644 W\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "Power : 15.403970599996644 W\n", "Power-Stack : 354.2913237999228 W\n", "Power-Thermal : 330.32667620007715 W\n", "VStack : 14.640137347104249 V\n", @@ -2899,7 +2899,14 @@ "Vcell : 0.6105872603840126 V\n", "###########\n", "I : 30.5\n", - "PEM Efficiency : 0.39114826688343785 \n", + "PEM Efficiency : 0.39114826688343785 " + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Power : 18.610834538313973 W\n", "Power-Stack : 428.0491943812214 W\n", "Power-Thermal : 434.7958056187786 W\n", @@ -3895,16 +3902,16 @@ "Power : 24.227504566813423 W\n", "Power-Stack : 557.2326050367087 W\n", "Power-Thermal : 656.4083949632912 W\n", - "VStack : 12.989105012510693 V\n" + "VStack : 12.989105012510693 V\n", + "Vcell : 0.5647436961961171 V\n", + "###########\n", + "I : 43.0\n" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "Vcell : 0.5647436961961171 V\n", - "###########\n", - "I : 43.0\n", "PEM Efficiency : 0.3617947814411964 \n", "Power : 24.26919393907546 W\n", "Power-Stack : 558.1914605987356 W\n", @@ -4904,7 +4911,14 @@ "VStack : 12.039674371441853 V\n", "Vcell : 0.5234641031061675 V\n", "###########\n", - "I : 55.5\n", + "I : 55.5" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PEM Efficiency : 0.33534900150383506 \n", "Power : 29.03451655020204 W\n", "Power-Stack : 667.7938806546468 W\n", @@ -5759,13 +5773,7 @@ "Power-Thermal : 1125.4063708097049 W\n", "VStack : 11.264185010443192 V\n", "Vcell : 0.48974717436709536 V\n", - "###########\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "###########\n", "I : 66.2\n", "PEM Efficiency : 0.31374021172793004 \n", "Power : 32.400579145566795 W\n", @@ -5909,7 +5917,13 @@ "Power-Thermal : 1164.8348213146521 W\n", "VStack : 11.134847992420438 V\n", "Vcell : 0.48412382575741036 V\n", - "###########\n", + "###########\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "I : 68.0\n", "PEM Efficiency : 0.3101355057761474 \n", "Power : 32.89917445273371 W\n", @@ -6909,7 +6923,14 @@ "Power-Thermal : 1452.5904931249722 W\n", "VStack : 10.2229540656098 V\n", "Vcell : 0.4444762637221652 V\n", - "###########\n", + "###########" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "I : 80.5\n", "PEM Efficiency : 0.2847107130754934 \n", "Power : 35.753971348020464 W\n", @@ -7406,13 +7427,7 @@ "VStack : 9.738585869705435 V\n", "Vcell : 0.42341677694371455 V\n", "###########\n", - "I : 86.7\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "I : 86.7\n", "PEM Efficiency : 0.2711922748724581 \n", "Power : 36.67929756104971 W\n", "Power-Stack : 843.6238439041433 W\n", @@ -7914,7 +7929,13 @@ "Power-Stack : 851.8441249512796 W\n", "Power-Thermal : 1776.2968750487203 W\n", "VStack : 9.169473896138639 V\n", - "Vcell : 0.3986727780929843 V\n", + "Vcell : 0.3986727780929843 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "###########\n", "I : 93.0\n", "PEM Efficiency : 0.2552699141146107 \n", @@ -8420,7 +8441,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.html b/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.html index 2c94a427..b2a222e4 100644 --- a/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.html +++ b/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -675,6 +675,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.opem b/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.opem index bde62019..1b134e8e 100644 --- a/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.opem +++ b/Documents/Padulles-Amphlett/Padulles_Amphlett_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:11:37.179895 +Simulation Date : 2024-03-12 09:11:57.673987 ********** Padulles-Amphlett Model diff --git a/Documents/Padulles-Hauer/Padulles_Hauer_Test.html b/Documents/Padulles-Hauer/Padulles_Hauer_Test.html index 79773cce..d651f01e 100644 --- a/Documents/Padulles-Hauer/Padulles_Hauer_Test.html +++ b/Documents/Padulles-Hauer/Padulles_Hauer_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -600,6 +600,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Padulles-Hauer/Padulles_Hauer_Test.opem b/Documents/Padulles-Hauer/Padulles_Hauer_Test.opem index 3d52ec33..15122fb9 100644 --- a/Documents/Padulles-Hauer/Padulles_Hauer_Test.opem +++ b/Documents/Padulles-Hauer/Padulles_Hauer_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:11:58.688261 +Simulation Date : 2024-03-12 09:12:09.245651 ********** Padulles-Hauer Model diff --git a/Documents/Padulles-I/PadullesI_Test.html b/Documents/Padulles-I/PadullesI_Test.html index a1f3bebb..c7bceb86 100644 --- a/Documents/Padulles-I/PadullesI_Test.html +++ b/Documents/Padulles-I/PadullesI_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -526,6 +526,6 @@

Graphs

Warning : There are errors in the simulations in some of I amounts; please refer to the .opem file for review. If you are confident about this parameters, ignore this warning.

-

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Padulles-I/PadullesI_Test.opem b/Documents/Padulles-I/PadullesI_Test.opem index 56da5972..3d4701d7 100644 --- a/Documents/Padulles-I/PadullesI_Test.opem +++ b/Documents/Padulles-I/PadullesI_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:10:50.453393 +Simulation Date : 2024-03-12 09:12:19.883555 ********** Padulles-I Model diff --git a/Documents/Padulles-II/Padulles2_Test.html b/Documents/Padulles-II/Padulles2_Test.html index 40432485..6d535c44 100644 --- a/Documents/Padulles-II/Padulles2_Test.html +++ b/Documents/Padulles-II/Padulles2_Test.html @@ -6,9 +6,9 @@ - - - + + + @@ -581,6 +581,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/Documents/Padulles-II/Padulles2_Test.opem b/Documents/Padulles-II/Padulles2_Test.opem index f30d0fad..3ad86050 100644 --- a/Documents/Padulles-II/Padulles2_Test.opem +++ b/Documents/Padulles-II/Padulles2_Test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:11:14.729855 +Simulation Date : 2024-03-12 09:12:29.916868 ********** Padulles-II Model diff --git a/Documents/Padulles1.ipynb b/Documents/Padulles1.ipynb index 2fad8804..76221362 100644 --- a/Documents/Padulles1.ipynb +++ b/Documents/Padulles1.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -1973,7 +1973,14 @@ "FC Power : 841.4326567237621 W\n", "FC Voltage : 54.285977853145944 V\n", "PH2 : 2.1307032788145275 atm\n", - "PO2 : 2.075336533636484 atm\n", + "PO2 : 2.075336533636484 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Power-Thermal : 836.2873432762378 W\n", "###########\n", "I : 15.6\n", @@ -2472,13 +2479,7 @@ "Power-Thermal : 1133.9145896301907 W\n", "###########\n", "I : 21.1\n", - "E : 54.247637733466775 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "E : 54.247637733466775 V\n", "FC Efficiency : 0.3951292351107273 \n", "FC Power : 1144.5345034556135 W\n", "FC Voltage : 54.24334139600064 V\n", @@ -2978,7 +2979,13 @@ "FC Power : 1441.8479051980328 W\n", "FC Voltage : 54.20480846609146 V\n", "PH2 : 2.1032544532926587 atm\n", - "PO2 : 2.059838940932276 atm\n", + "PO2 : 2.059838940932276 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Power-Thermal : 1437.3360948019672 W\n", "###########\n", "I : 26.7\n", @@ -3978,7 +3985,14 @@ "FC Voltage : 54.13252021001672 V\n", "PH2 : 2.0758056277707895 atm\n", "PO2 : 2.0443413482280683 atm\n", - "Power-Thermal : 2039.8519880823696 W\n", + "Power-Thermal : 2039.8519880823696 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "###########\n", "I : 37.8\n", "E : 54.21464028556451 V\n", @@ -4146,13 +4160,7 @@ "E : 54.21104827859512 V\n", "FC Efficiency : 0.3942353077454364 \n", "FC Power : 2143.1766726728233 W\n", - "FC Voltage : 54.12062304729351 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Voltage : 54.12062304729351 V\n", "PH2 : 2.071107180158938 atm\n", "PO2 : 2.0416886071345552 atm\n", "Power-Thermal : 2143.1273273271768 W\n", @@ -4983,7 +4991,13 @@ "FC Voltage : 54.064298879577926 V\n", "PH2 : 2.0483568022489207 atm\n", "PO2 : 2.0288437555238605 atm\n", - "Power-Thermal : 2643.774214676597 W\n", + "Power-Thermal : 2643.774214676597 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "###########\n", "I : 48.9\n", "E : 54.19237755381945 V\n", @@ -5767,13 +5781,7 @@ "PH2 : 2.026842857920969 atm\n", "PO2 : 2.016696993674617 atm\n", "Power-Thermal : 3118.0833046248376 W\n", - "###########\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "###########\n", "I : 57.6\n", "E : 54.17473889524618 V\n", "FC Efficiency : 0.3934431421755882 \n", @@ -5989,7 +5997,14 @@ "PH2 : 2.0209079767270515 atm\n", "PO2 : 2.013346162819653 atm\n", "Power-Thermal : 3249.0752075624555 W\n", - "###########\n", + "###########" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "I : 60.0\n", "E : 54.16984325683484 V\n", "FC Efficiency : 0.3933403034147376 \n", @@ -6988,7 +7003,13 @@ "PH2 : 1.9934591512051827 atm\n", "PO2 : 1.9978485701154451 atm\n", "Power-Thermal : 3855.741661097723 W\n", - "###########\n", + "###########\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "I : 71.1\n", "E : 54.1470304174573 V\n", "FC Efficiency : 0.3928700641102536 \n", @@ -7489,13 +7510,7 @@ "FC Efficiency : 0.39263963421378173 \n", "FC Power : 4128.860184240884 W\n", "FC Voltage : 53.90156898486795 V\n", - "PH2 : 1.9796110950860415 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PH2 : 1.9796110950860415 atm\n", "PO2 : 1.9900299647871962 atm\n", "Power-Thermal : 4162.323815759114 W\n", "###########\n", @@ -7994,7 +8009,14 @@ "PO2 : 1.9823509774112373 atm\n", "Power-Thermal : 4463.767853290947 W\n", "###########\n", - "I : 82.2\n", + "I : 82.2" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "E : 54.12393177896357 V\n", "FC Efficiency : 0.39240632915109086 \n", "FC Power : 4428.076259173837 W\n", @@ -8993,7 +9015,13 @@ "PO2 : 1.9668533847070295 atm\n", "Power-Thermal : 5073.152673717628 W\n", "###########\n", - "I : 93.3\n", + "I : 93.3\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "E : 54.100539789674976 V\n", "FC Efficiency : 0.3919468611509362 \n", "FC Power : 5020.143193718088 W\n", @@ -9494,13 +9522,7 @@ "FC Power : 5313.005788176512 W\n", "FC Voltage : 53.77536222850721 V\n", "PH2 : 1.9247134440423033 atm\n", - "PO2 : 1.959034779378781 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PO2 : 1.959034779378781 atm\n", "Power-Thermal : 5381.106211823487 W\n", "###########\n", "I : 98.9\n", @@ -9710,7 +9732,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/Documents/Padulles2.ipynb b/Documents/Padulles2.ipynb index d4dc36a2..11c2ba01 100644 --- a/Documents/Padulles2.ipynb +++ b/Documents/Padulles2.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -1999,7 +1999,14 @@ "FC Power : 42.68327669167784 W\n", "FC Voltage : 3.0488054779769884 V\n", "PH2 : 2.1670656664325647 atm\n", - "PH2O : 2.6672839011922354 atm\n", + "PH2O : 2.6672839011922354 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PO2 : 2.0958667188936957 atm\n", "Power-Thermal : 43.41672330832217 W\n", "###########\n", @@ -2495,13 +2502,7 @@ "###########\n", "I : 19.0\n", "E : 3.0119858180443124 V\n", - "FC Efficiency : 0.38705902611374643 \n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Efficiency : 0.38705902611374643 \n", "FC Power : 57.362147670057226 W\n", "FC Voltage : 3.0190604036872224 V\n", "PH2 : 2.1663631473518454 atm\n", @@ -3004,7 +3005,13 @@ "FC Efficiency : 0.3836850805168974 \n", "FC Power : 71.8258470727632 W\n", "FC Voltage : 2.9927436280318 V\n", - "PH2 : 2.1656606282711257 atm\n", + "PH2 : 2.1656606282711257 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PH2O : 2.665554541659381 atm\n", "PO2 : 2.095073435073865 atm\n", "Power-Thermal : 75.77415292723681 W\n", @@ -4004,7 +4011,14 @@ "FC Efficiency : 0.37766551600568005 \n", "FC Power : 100.15689484470634 W\n", "FC Voltage : 2.945791024844304 V\n", - "PH2 : 2.164255590109687 atm\n", + "PH2 : 2.164255590109687 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PH2O : 2.663825182126527 atm\n", "PO2 : 2.094280151254035 atm\n", "Power-Thermal : 108.94310515529367 W\n", @@ -4136,13 +4150,7 @@ "FC Voltage : 2.9400577585162586 V\n", "PH2 : 2.1640729351487002 atm\n", "PH2O : 2.6636003653872558 atm\n", - "PO2 : 2.094177024357457 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PO2 : 2.094177024357457 atm\n", "Power-Thermal : 113.31096112437608 W\n", "###########\n", "I : 35.4\n", @@ -5009,7 +5017,13 @@ "E : 3.0119508337240952 V\n", "FC Efficiency : 0.3722000680242963 \n", "FC Power : 127.73906334593849 W\n", - "FC Voltage : 2.903160530589511 V\n", + "FC Voltage : 2.903160530589511 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PH2 : 2.162850551948248 atm\n", "PH2O : 2.6620958225936726 atm\n", "PO2 : 2.0934868674342044 atm\n", @@ -6006,16 +6020,17 @@ "Power-Thermal : 177.14476560829522 W\n", "###########\n", "I : 54.0\n", - "E : 3.011936830715516 V\n" + "E : 3.011936830715516 V\n", + "FC Efficiency : 0.3670594228831835 \n", + "FC Power : 154.6054289183969 W\n", + "FC Voltage : 2.8630634984888315 V" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "FC Efficiency : 0.3670594228831835 \n", - "FC Power : 154.6054289183969 W\n", - "FC Voltage : 2.8630634984888315 V\n", + "\n", "PH2 : 2.1614455137868096 atm\n", "PH2O : 2.6603664630608184 atm\n", "PO2 : 2.092693583614374 atm\n", @@ -7014,7 +7029,13 @@ "I : 64.0\n", "E : 3.011922822397767 V\n", "FC Efficiency : 0.3621324888696624 \n", - "FC Power : 180.77653844373546 W\n", + "FC Power : 180.77653844373546 W\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "FC Voltage : 2.8246334131833666 V\n", "PH2 : 2.1600404756253706 atm\n", "PH2O : 2.6586371035279637 atm\n", @@ -7539,13 +7560,7 @@ "PH2 : 2.1593098557814225 atm\n", "PH2O : 2.6577378365708797 atm\n", "PO2 : 2.0914877922082318 atm\n", - "Power-Thermal : 231.4644199213322 W\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "Power-Thermal : 231.4644199213322 W\n", "###########\n", "I : 69.3\n", "E : 3.0119153958353797 V\n", @@ -8020,7 +8035,14 @@ "I : 74.0\n", "E : 3.0119088087668198 V\n", "FC Efficiency : 0.3573569301207881 \n", - "FC Power : 206.26642006571893 W\n", + "FC Power : 206.26642006571893 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Voltage : 2.7873840549421476 V\n", "PH2 : 2.1586354374639316 atm\n", "PH2O : 2.6569077439951094 atm\n", @@ -9019,7 +9041,13 @@ "###########\n", "I : 84.0\n", "E : 3.0118947898186437 V\n", - "FC Efficiency : 0.35269424448917813 \n", + "FC Efficiency : 0.35269424448917813 \n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "FC Power : 231.08526898930955 W\n", "FC Voltage : 2.75101510701559 V\n", "PH2 : 2.157230399302493 atm\n", @@ -9466,13 +9494,7 @@ "PH2O : 2.654417466267799 atm\n", "PO2 : 2.0899646872741573 atm\n", "Power-Thermal : 301.86495801683884 W\n", - "###########\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "###########\n", "I : 88.5\n", "E : 3.011888479556143 V\n", "FC Efficiency : 0.35062575427232445 \n", @@ -10025,7 +10047,14 @@ "###########\n", "I : 94.0\n", "E : 3.0118807655492006 V\n", - "FC Efficiency : 0.3481189755740837 \n", + "FC Efficiency : 0.3481189755740837 " + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "FC Power : 255.24083289091823 W\n", "FC Voltage : 2.7153280094778536 V\n", "PH2 : 2.155825361141054 atm\n", @@ -10727,7 +10756,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/Documents/Padulles_Amphlett.ipynb b/Documents/Padulles_Amphlett.ipynb index 8e851fde..b2803dd8 100644 --- a/Documents/Padulles_Amphlett.ipynb +++ b/Documents/Padulles_Amphlett.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -2217,7 +2217,14 @@ "PH2 : 0.1958219056978206 atm\n", "PH2O : 0.24102297621115232 atm\n", "PO2 : 0.1898648161712607 atm\n", - "Power-Thermal : 25.441871865441584 W\n", + "Power-Thermal : 25.441871865441584 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "###########\n", "I : 9.8\n", "E : 6.06826605610141 V\n", @@ -2713,13 +2720,7 @@ "E : 6.068211984560119 V\n", "Eta Activation : 0.5095915142772953 V\n", "Eta Concentration : 0.0028471665839366503 V\n", - "Eta Ohmic : 0.02444308008628188 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "Eta Ohmic : 0.02444308008628188 V\n", "FC Efficiency : 0.4338209204900703 \n", "FC Power : 45.0045822916399 W\n", "FC Voltage : 3.3838031798225487 V\n", @@ -3222,7 +3223,13 @@ "I : 16.9\n", "E : 6.068156285437771 V\n", "Eta Activation : 0.5255270011168852 V\n", - "Eta Concentration : 0.003722485968397542 V\n", + "Eta Concentration : 0.003722485968397542 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Eta Ohmic : 0.03150742583321312 V\n", "FC Efficiency : 0.41850919498016564 \n", "FC Power : 55.16788208228543 W\n", @@ -4222,7 +4229,14 @@ "FC Power : 73.55240483600554 W\n", "FC Voltage : 3.064683534833564 V\n", "Loss : 0.6006725305675302 V\n", - "PH2 : 0.19381270112696308 atm\n", + "PH2 : 0.19381270112696308 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PH2O : 0.23854999207917058 atm\n", "PO2 : 0.18873042030890314 atm\n", "Power-Thermal : 74.04759516399447 W\n", @@ -4349,13 +4363,7 @@ "FC Voltage : 3.041426087773028 V\n", "Loss : 0.6053212240769233 V\n", "PH2 : 0.1936862476924336 atm\n", - "PH2O : 0.23839434972121373 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PH2O : 0.23839434972121373 atm\n", "PO2 : 0.1886590247651184 atm\n", "Power-Thermal : 77.40349041445161 W\n", "###########\n", @@ -5227,7 +5235,13 @@ "PO2 : 0.18816718879682354 atm\n", "Power-Thermal : 101.44322960607549 W\n", "###########\n", - "I : 31.2\n", + "I : 31.2\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "E : 6.067934203179685 V\n", "Eta Activation : 0.5664234998312079 V\n", "Eta Concentration : 0.00782456233824603 V\n", @@ -6224,16 +6238,17 @@ "I : 38.3\n", "E : 6.067823440647288 V\n", "Eta Activation : 0.5801510597119568 V\n", - "Eta Concentration : 0.010380852224915436 V\n" + "Eta Concentration : 0.010380852224915436 V\n", + "Eta Ohmic : 0.07943995339128827 V\n", + "FC Efficiency : 0.3484569376931391 \n", + "FC Power : 104.09802556644838 W" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "Eta Ohmic : 0.07943995339128827 V\n", - "FC Efficiency : 0.3484569376931391 \n", - "FC Power : 104.09802556644838 W\n", + "\n", "FC Voltage : 2.7179641140064854 V\n", "Loss : 0.6699718653281606 V\n", "PH2 : 0.19180349655610554 atm\n", @@ -7232,7 +7247,13 @@ "Loss : 0.7035000704790304 V\n", "PH2 : 0.19080591946148398 atm\n", "PH2O : 0.23484916267886227 atm\n", - "PO2 : 0.18703279293446598 atm\n", + "PO2 : 0.18703279293446598 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Power-Thermal : 163.43037553278862 W\n", "###########\n", "I : 45.5\n", @@ -7730,13 +7751,7 @@ "Eta Activation : 0.5966948119995634 V\n", "Eta Concentration : 0.01532996106919849 V\n", "Eta Ohmic : 0.10890394678952171 V\n", - "FC Efficiency : 0.31577080611937136 \n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Efficiency : 0.31577080611937136 \n", "FC Power : 120.68760209882373 W\n", "FC Voltage : 2.4630122877310967 V\n", "Loss : 0.7209287198582837 V\n", @@ -8238,7 +8253,14 @@ "I : 52.6\n", "E : 6.067599342575764 V\n", "Eta Activation : 0.6014671940866525 V\n", - "Eta Concentration : 0.017453281951678775 V\n", + "Eta Concentration : 0.017453281951678775 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "Eta Ohmic : 0.11995477262110017 V\n", "FC Efficiency : 0.30425937170238543 \n", "FC Power : 124.83153502205471 W\n", @@ -9237,7 +9259,13 @@ "FC Efficiency : 0.2800625324248005 \n", "FC Power : 130.4139188489326 W\n", "FC Voltage : 2.184487752913444 V\n", - "Loss : 0.7765999634346005 V\n", + "Loss : 0.7765999634346005 V\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PH2 : 0.18879671489062644 atm\n", "PH2O : 0.23237617854688053 atm\n", "PO2 : 0.18589839707210842 atm\n", @@ -9296,13 +9324,7 @@ "Loss : 0.7788495581532526 V\n", "PH2 : 0.1887405133641689 atm\n", "PH2O : 0.23230700416556635 atm\n", - "PO2 : 0.1858666657193152 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PO2 : 0.1858666657193152 atm\n", "Power-Thermal : 239.00366832043693 W\n", "###########\n", "I : 60.2\n", @@ -10243,7 +10265,14 @@ "PO2 : 0.1853351655600288 atm\n", "Power-Thermal : 279.2807818561303 W\n", "###########\n", - "I : 66.9\n", + "I : 66.9" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "E : 6.067373876967314 V\n", "Eta Activation : 0.6177029635915067 V\n", "Eta Concentration : 0.03151135117309963 V\n", @@ -10977,13 +11006,7 @@ "Eta Concentration : 0.044254024660310205 V\n", "Eta Ohmic : 0.19316195848750278 V\n", "FC Efficiency : 0.22645413303281556 \n", - "FC Power : 127.3532753349948 W\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Power : 127.3532753349948 W\n", "FC Voltage : 1.7663422376559614 V\n", "Loss : 0.8601898618975672 V\n", "PH2 : 0.18705446757044228 atm\n", @@ -11248,7 +11271,13 @@ "Eta Activation : 0.6245381051230374 V\n", "Eta Concentration : 0.054497944121831225 V\n", "Eta Ohmic : 0.2017656593840103 V\n", - "FC Efficiency : 0.2132375482214336 \n", + "FC Efficiency : 0.2132375482214336 \n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "FC Power : 123.0807128334115 W\n", "FC Voltage : 1.6632528761271823 V\n", "Loss : 0.8808017086288789 V\n", @@ -11487,7 +11516,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/Documents/Padulles_Hauer.ipynb b/Documents/Padulles_Hauer.ipynb index 859990c4..070d5466 100644 --- a/Documents/Padulles_Hauer.ipynb +++ b/Documents/Padulles_Hauer.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Version 1.3" + "### Version 1.4" ] }, { @@ -2022,7 +2022,14 @@ "PH2 : 0.1952317896700163 atm\n", "PH2O : 0.2402966452073535 atm\n", "PO2 : 0.18953163696693187 atm\n", - "Power-Thermal : 44.33181469948611 W\n", + "Power-Thermal : 44.33181469948611 W" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "###########\n", "I : 14.0\n", "E : 2.9232011607494286 V\n", @@ -2518,13 +2525,7 @@ "E : 2.923125305159725 V\n", "FC Efficiency : 0.3757378174128644 \n", "FC Power : 55.39126904300446 W\n", - "FC Voltage : 2.930754975820342 V\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Voltage : 2.930754975820342 V\n", "PH2 : 0.19452927058929687 atm\n", "PH2O : 0.23943196544092632 atm\n", "PO2 : 0.18913499505701667 atm\n", @@ -3027,7 +3028,13 @@ "FC Voltage : 2.9043150023182953 V\n", "PH2 : 0.19382675150857745 atm\n", "PH2O : 0.23856728567449914 atm\n", - "PO2 : 0.18873835314710147 atm\n", + "PO2 : 0.18873835314710147 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "Power-Thermal : 77.57187144459274 W\n", "###########\n", "I : 24.0\n", @@ -4024,16 +4031,17 @@ "E : 2.9228921213341286 V\n", "FC Efficiency : 0.3663028233044334 \n", "FC Power : 96.8577925381583 W\n", - "FC Voltage : 2.857162021774581 V\n" + "FC Voltage : 2.857162021774581 V\n", + "PH2 : 0.19242171334713862 atm\n", + "PH2O : 0.23683792614164476 atm\n", + "PO2 : 0.187945069327271 atm" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "PH2 : 0.19242171334713862 atm\n", - "PH2O : 0.23683792614164476 atm\n", - "PO2 : 0.187945069327271 atm\n", + "\n", "Power-Thermal : 111.6272074618417 W\n", "###########\n", "I : 34.0\n", @@ -5032,7 +5040,13 @@ "FC Power : 123.55028250316172 W\n", "FC Voltage : 2.8143572324182626 V\n", "PH2 : 0.1910166751856998 atm\n", - "PH2O : 0.23510856660879045 atm\n", + "PH2O : 0.23510856660879045 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PO2 : 0.18715178550744055 atm\n", "Power-Thermal : 146.4347174968383 W\n", "###########\n", @@ -5982,13 +5996,7 @@ "FC Power : 148.24188070414206 W\n", "FC Voltage : 2.7760651817255066 V\n", "PH2 : 0.1896818889323329 atm\n", - "PH2O : 0.23346567505257879 atm\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "PH2O : 0.23346567505257879 atm\n", "PO2 : 0.1863981658786016 atm\n", "Power-Thermal : 180.16811929585796 W\n", "###########\n", @@ -6038,7 +6046,14 @@ "FC Power : 149.523834509813 W\n", "FC Voltage : 2.774097115209889 V\n", "PH2 : 0.18961163702426098 atm\n", - "PH2O : 0.23337920707593607 atm\n", + "PH2O : 0.23337920707593607 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PO2 : 0.1863585016876101 atm\n", "Power-Thermal : 181.961165490187 W\n", "###########\n", @@ -7037,7 +7052,13 @@ "FC Efficiency : 0.3507063565908972 \n", "FC Power : 174.79906225203501 W\n", "FC Voltage : 2.7355095814089987 V\n", - "PH2 : 0.18820659886282212 atm\n", + "PH2 : 0.18820659886282212 atm\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "PH2O : 0.2316498475430817 atm\n", "PO2 : 0.18556521786777963 atm\n", "Power-Thermal : 218.185937747965 W\n", @@ -7535,13 +7556,7 @@ "I : 68.9\n", "E : 2.922342233357707 V\n", "FC Efficiency : 0.3482925235142822 \n", - "FC Power : 187.17936798704557 W\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Power : 187.17936798704557 W\n", "FC Voltage : 2.716681683411401 V\n", "PH2 : 0.1875040797821027 atm\n", "PH2O : 0.23078516777665453 atm\n", @@ -8043,7 +8058,14 @@ "FC Efficiency : 0.3459110063394885 \n", "FC Power : 199.390022274208 W\n", "FC Voltage : 2.6981058494480106 V\n", - "PH2 : 0.1868015607013833 atm\n", + "PH2 : 0.1868015607013833 atm" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PH2O : 0.22992048801022735 atm\n", "PO2 : 0.18477193404794917 atm\n", "Power-Thermal : 255.09497772579206 W\n", @@ -9040,15 +9062,15 @@ "###########\n", "I : 83.9\n", "E : 2.9221040384630665 V\n", - "FC Efficiency : 0.34122875110065953 \n" + "FC Efficiency : 0.34122875110065953 \n", + "FC Power : 223.30691929529362 W\n", + "FC Voltage : 2.6615842585851444 V\n" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "FC Power : 223.30691929529362 W\n", - "FC Voltage : 2.6615842585851444 V\n", "PH2 : 0.18539652253994446 atm\n", "PH2O : 0.22819112847737297 atm\n", "PO2 : 0.1839786502281187 atm\n", @@ -10048,7 +10070,14 @@ "E : 2.9219443844429955 V\n", "FC Efficiency : 0.3366340352014401 \n", "FC Power : 246.5575000622388 W\n", - "FC Voltage : 2.625745474571233 V\n", + "FC Voltage : 2.625745474571233 V" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\n", "PH2 : 0.18399148437850565 atm\n", "PH2O : 0.22646176894451867 atm\n", "PO2 : 0.18318536640828828 atm\n", @@ -10546,13 +10575,7 @@ "###########\n", "I : 98.9\n", "E : 2.9218642979772094 V\n", - "FC Efficiency : 0.334363735298155 \n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ + "FC Efficiency : 0.334363735298155 \n", "FC Power : 257.9348726837028 W\n", "FC Voltage : 2.6080371353256093 V\n", "PH2 : 0.18328896529778624 atm\n", @@ -10764,7 +10787,7 @@ "outputs": [], "source": [ "import sys\n", - "!{sys.executable} -m pip -q -q install matplotlib;\n", + "!{sys.executable} -m pip -qqq install matplotlib;\n", "import matplotlib.pyplot as plt" ] }, diff --git a/INSTALL.md b/INSTALL.md index 4211063c..26810c66 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -4,12 +4,12 @@ - Download and install [Python3.x](https://www.python.org/downloads/) (>=3.5) - [x] Select `Add to PATH` option - [x] Select `Install pip` option -- Download [Version 1.3](https://github.com/ecsim/opem/archive/v1.3.zip) or [Latest Source ](https://github.com/ecsim/opem/archive/master.zip) +- Download [Version 1.4](https://github.com/ecsim/opem/archive/v1.4.zip) or [Latest Source ](https://github.com/ecsim/opem/archive/master.zip) - Run `pip install .` ### PyPI - Check [Python Packaging User Guide](https://packaging.python.org/installing/) -- Run `pip install opem==1.3` +- Run `pip install opem==1.4` ### Conda - Check [Conda Managing Package](https://conda.io) @@ -19,8 +19,8 @@ - OPEM GUI is available [here](https://github.com/ECSIM/gopem) ### Exe Version (Only Windows) -- Download [Exe-Version 1.3](https://github.com/ECSIM/opem/releases/download/v1.3/OPEM-1.3.exe) -- Run `OPEM-1.3.exe` +- Download [Exe-Version 1.4](https://github.com/ECSIM/opem/releases/download/v1.4/OPEM-1.4.exe) +- Run `OPEM-1.4.exe` ### MATLAB - Download and install [MATLAB](https://www.mathworks.com/products/matlab.html) (>=8.5, 64/32 bit) diff --git a/OPEM.spec b/OPEM.spec index a8cc4435..bd440b1f 100644 --- a/OPEM.spec +++ b/OPEM.spec @@ -3,7 +3,7 @@ block_cipher = None -opem_version = "1.3" +opem_version = "1.4" a = Analysis(['opem/__main__.py'], diff --git a/opem/Params.py b/opem/Params.py index 81faa9fd..3b4bee30 100644 --- a/opem/Params.py +++ b/opem/Params.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """OPEM parameters.""" -Version = 1.3 +Version = 1.4 Website = "http://www.ecsim.site/opem" UpdateUrl = "http://www.ecsim.site/opem/update" Overview = ''' diff --git a/otherfile/Version.rc b/otherfile/Version.rc index 3d7cad8d..a315799c 100644 --- a/otherfile/Version.rc +++ b/otherfile/Version.rc @@ -1,7 +1,7 @@ VSVersionInfo( ffi=FixedFileInfo( - filevers=(1, 3, 0, 0), - prodvers=(1, 3, 0, 0), + filevers=(1, 4, 0, 0), + prodvers=(1, 4, 0, 0), mask=0x3f, flags=0x0, OS=0x40004, @@ -16,12 +16,12 @@ VSVersionInfo( u'040904B0', [StringStruct(u'CompanyName', u'ECSIM'), StringStruct(u'FileDescription', u'OPEM.exe'), - StringStruct(u'FileVersion', u'1.3.0.0'), + StringStruct(u'FileVersion', u'1.4.0.0'), StringStruct(u'InternalName', u'OPEM.exe'), - StringStruct(u'LegalCopyright', u'Copyright (c) 2021 ECSIM'), + StringStruct(u'LegalCopyright', u'Copyright (c) 2024 ECSIM'), StringStruct(u'OriginalFilename', u'OPEM.exe'), StringStruct(u'ProductName', u'OPEM'), - StringStruct(u'ProductVersion', u'1, 3, 0, 0')]) + StringStruct(u'ProductVersion', u'1, 4, 0, 0')]) ]), VarFileInfo([VarStruct(u'Translation', [1033, 1200])]) ] diff --git a/otherfile/meta.yaml b/otherfile/meta.yaml index 4b8f5ac0..f1c2c53b 100644 --- a/otherfile/meta.yaml +++ b/otherfile/meta.yaml @@ -1,5 +1,5 @@ {% set name = "opem" %} -{% set version = "1.3" %} +{% set version = "1.4" %} package: name: {{ name|lower }} diff --git a/otherfile/test.html b/otherfile/test.html index 25c0e5eb..ac6e4ebf 100644 --- a/otherfile/test.html +++ b/otherfile/test.html @@ -6,9 +6,9 @@ - - - + + + @@ -485,6 +485,6 @@

Graphs

}); -

Generated By OPEM Version 1.3

+

Generated By OPEM Version 1.4

\ No newline at end of file diff --git a/otherfile/test.opem b/otherfile/test.opem index 49c19cb8..14e653b7 100644 --- a/otherfile/test.opem +++ b/otherfile/test.opem @@ -4,7 +4,7 @@ | |_| || |_) || __/| | | | | | \___/ | .__/ \___||_| |_| |_| |_| -Simulation Date : 2021-06-17 11:09:09.457234 +Simulation Date : 2024-03-12 09:11:00.370426 ********** Amphlett Model diff --git a/otherfile/version_check.py b/otherfile/version_check.py index 599959d5..f789cc09 100644 --- a/otherfile/version_check.py +++ b/otherfile/version_check.py @@ -4,7 +4,7 @@ import sys import codecs Failed = 0 -VERSION = "1.3" +VERSION = "1.4" VERSION_1 = VERSION.split(".")[0] VERSION_2 = str(int(float(VERSION) * 10 - int(VERSION_1) * 10)) @@ -34,7 +34,7 @@ "prodvers=({0}, {1}, {2}, {3})", "(u'FileVersion', u'{0}.{1}.{2}.{3}'),", "(u'ProductVersion', u'{0}, {1}, {2}, {3}')"] -TEST_ITEMS = ["New Version ({0}) Is Available!"] +TEST_ITEMS = ["check_update({0})"] META_ITEMS = ['% set version = "{0}" %'] SPEC_ITEMS = ['opem_version = "{0}"'] diff --git a/pytest.ini b/pytest.ini index d06d8946..262d5f07 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,4 +1,4 @@ # content of pytest.ini [pytest] addopts = --doctest-modules -doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL NUMBER \ No newline at end of file +doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL NUMBER ELLIPSIS \ No newline at end of file diff --git a/setup.py b/setup.py index 5a79874c..d3cc9d73 100644 --- a/setup.py +++ b/setup.py @@ -38,14 +38,14 @@ def read_description(): setup( name='opem', packages=['opem', 'opem.Static', 'opem.Dynamic'], - version='1.3', + version='1.4', description='Open Source PEM Cell Simulation Tool', long_description=read_description(), long_description_content_type='text/markdown', author='ECSIM Development Team', author_email='opem@ecsim.site', url='https://github.com/ecsim/opem', - download_url='https://github.com/ecsim/opem/tarball/v1.3', + download_url='https://github.com/ecsim/opem/tarball/v1.4', keywords="OPEM PEM FC CELL Fuel-Cell Chemistry", project_urls={ 'Webpage': 'http://opem.ecsim.site', diff --git a/test/test_Functions.py b/test/test_Functions.py index a3d88be7..6094daf4 100644 --- a/test/test_Functions.py +++ b/test/test_Functions.py @@ -68,10 +68,10 @@ ########### ->>> check_update(1.3) +>>> check_update(1.4) >>> check_update(0.1) ########### -New Version (1.3) Is Available! +... Website : http://www.ecsim.site/opem ########### >>> file1 = CSV_Init(OutputParamsKeys=["1","2","3"], OutputParams={"1":"1", "2":"2", "3":"3"}, Title="CSV_Test", Name="CSV_Test", Folder=os.path.join("CSV_Folder1", "CSV_Folder2"))