Skip to content

Commit

Permalink
Merge pull request #1483 from idaholab/wangc/update_submodule_ID
Browse files Browse the repository at this point in the history 
update submodule IDs of LOGOS and SR2ML
  • Loading branch information
@mandd
mandd authored Mar 17, 2021
2 parents 1785d90 + 4ee2a64 commit 395bda6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion plugins/LOGOS
Submodule LOGOS updated 24 files
+46 −0 .github/ISSUE_TEMPLATE/bug_report.md
+20 −0 .github/ISSUE_TEMPLATE/feature_request.md
+0 −0 .github/issue_templates/ISSUE_TEMPLATE.md
+0 −0 .github/merge_request_templates/PULL_REQUEST_TEMPLATE.md
+5 −3 NOTICE.txt
+2 −0 __init__.py
+ − doc/sqa/CIlist/LST-1291_LOGOS_Configuration_Items_List.docx
+ − doc/sqa/LOGOS_SQA_Status_Dashboard.pptx
+1 −1 doc/sqa/sdd/dataInterfaceSystemControl.tex
+1 −1 doc/sqa/sdd/software_design_description.tex
+99 −0 doc/user_manual/include/Knapsack.tex
+1 −0 doc/user_manual/user_manual.tex
+90 −60 src/BatteryReplacementCashFlowModel.py
+1 −1 src/CapitalInvestments/PyomoModels/MultipleKnapsack.py
+72 −40 src/IncrementalNPV.py
+109 −0 src/knapsack/BaseKnapsackModel.py
+109 −0 src/knapsack/MultipleKnapsackModel.py
+96 −0 src/knapsack/SimpleKnapsackModel.py
+810 −811 tests/CapitalInvestments/examples/Stoch_Opt_UseCase3.py
+11 −0 tests/gold/BaseKnapsack/PrintPS.csv
+11 −0 tests/gold/MultipleKnapsack/PrintPS.csv
+115 −0 tests/test_BaseKnapsackModel.xml
+122 −0 tests/test_MultipleKnapsackModel.xml
+12 −0 tests/tests
2 changes: 1 addition & 1 deletion plugins/SR2ML
Submodule SR2ML updated 17 files
+46 −0 .github/ISSUE_TEMPLATE/bug_report.md
+43 −0 .github/ISSUE_TEMPLATE/feature_request.md
+75 −6 doc/user_manual/include/MCSsolver.tex
+1 −1 src/ETModel.py
+1 −1 src/FTModel.py
+117 −12 src/MCSSolver.py
+1 −1 src/TDFailureRateReliabilityModel.py
+4 −0 tests/MCSSolverTD/MCSlist.csv
+2 −0 tests/MCSSolverTD/maintenanceSchedule.csv
+5 −0 tests/MCSSolverTD/maintenanceSchedule1.csv
+4 −0 tests/MCSSolverTDfromPS/MCSlist.csv
+5 −0 tests/MCSSolverTDfromPS/maintenanceSchedule.csv
+5 −0 tests/gold/MCSSolverTD/Print_sim_PS_0.csv
+8 −0 tests/gold/MCSSolverTDfromPS/Print_sim_HS_0.csv
+103 −0 tests/test_MCSSolver_TD.xml
+105 −0 tests/test_MCSSolver_TD_fromPS.xml
+12 −0 tests/tests

0 comments on commit 395bda6

Please sign in to comment.