Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update FARM Submodule for EOY 2023 #2240

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Update FARM Submodule for EOY 2023 #2240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb0cc26
Update FARM Submodule
wanghy-anl Jan 4, 2024
f2d515a
more max_time, removed the redundant version of FARM-Beta and Gamma-LTI
wanghy-anl Jan 17, 2024
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
2 changes: 1 addition & 1 deletion plugins/FARM
Open in desktop
Submodule FARM updated 99 files
+604 −1,387 src/FARMValidatorsForHeron.py
+9 −9 src/MOAS.py
+0 −51 tests/heron_validator/FARM_Alpha/ABCD_Matrices/DMDcCxCoeff_BOP_para_alpha.xml
+0 −51 tests/heron_validator/FARM_Alpha/ABCD_Matrices/DMDcCxCoeff_SES_para_alpha.xml
+0 −3 tests/heron_validator/FARM_Alpha/gold/Sweep_Runs_o/Linux_sweep.csv
+0 −3 tests/heron_validator/FARM_Alpha/gold/Sweep_Runs_o/Windows_sweep.csv
+0 −120 tests/heron_validator/FARM_Alpha/heron_input_FARM_alpha_BOP_SES.xml
+0 −222 tests/heron_validator/FARM_Beta/ABCD_Matrices/DMDcCxCoeff_BOP_para.xml
+0 −222 tests/heron_validator/FARM_Beta/ABCD_Matrices/DMDcCxCoeff_SES_para.xml
+0 −412 tests/heron_validator/FARM_Beta/ABCD_Matrices/DMDcCxCoeff_TES_para.xml
+0 −3 tests/heron_validator/FARM_Beta/gold/Sweep_Runs_o/Linux_sweep.csv
+0 −3 tests/heron_validator/FARM_Beta/gold/Sweep_Runs_o/Windows_sweep.csv
+0 −333 tests/heron_validator/FARM_Beta/plot_HW_Beta_BOP_SES_MW_Result.m
+0 −3 tests/heron_validator/FARM_Delta_FMU/gold/Sweep_Runs_o/sweep.csv
+ − tests/heron_validator/FARM_Delta_FMU_StateVariableSelection/FMUs/BOP_SES_empty_MWinput.fmu
+0 −3 tests/heron_validator/FARM_Delta_FMU_StateVariableSelection/gold/Sweep_Runs_o/sweep.csv
+0 −24 tests/heron_validator/FARM_Delta_FMU_StateVariableSelection/tests
+0 −3 tests/heron_validator/FARM_Gamma_FMU/gold/Sweep_Runs_o/sweep.csv
+ − tests/heron_validator/FARM_Gamma_FMU_StateVariableSelection/FMUs/BOP_empty_MWinput.fmu
+ − tests/heron_validator/FARM_Gamma_FMU_StateVariableSelection/FMUs/SES_empty_MWinput.fmu
+ − tests/heron_validator/FARM_Gamma_FMU_StateVariableSelection/FMUs/TES_empty_MWinput.fmu
+0 −23 tests/heron_validator/FARM_Gamma_FMU_StateVariableSelection/tests
+0 −222 tests/heron_validator/FARM_Gamma_LTI/ABCD_Matrices/DMDcCxCoeff_BOP_para.xml
+0 −222 tests/heron_validator/FARM_Gamma_LTI/ABCD_Matrices/DMDcCxCoeff_SES_para.xml
+0 −412 tests/heron_validator/FARM_Gamma_LTI/ABCD_Matrices/DMDcCxCoeff_TES_para.xml
+0 −3 tests/heron_validator/FARM_Gamma_LTI/gold/Sweep_Runs_o/Linux_sweep.csv
+0 −3 tests/heron_validator/FARM_Gamma_LTI/gold/Sweep_Runs_o/Windows_sweep.csv
+0 −16 tests/heron_validator/FARM_Gamma_LTI/tests
+ − tests/heron_validator/FARM_MIMO_StateVarSelect/FMUs/BOP_SES_empty_MWinput.fmu
+0 −0 tests/heron_validator/FARM_MIMO_StateVarSelect/gold/stateVarSelection/svs_new_inputFile.xml
+0 −0 ..._validator/FARM_MIMO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/Prog_Test_DMDc_on_SESBOP.py
+0 −0 ..._MIMO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/simulatedData/DMDcCxCoeff_SESBOP_5400s.xml
+0 −0 tests/heron_validator/FARM_MIMO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/svsTemplate.py
+0 −0 ...n_validator/FARM_MIMO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/svs_inputFile_template.xml
+0 −0 ...s/heron_validator/FARM_MIMO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/svs_template_input.i
+0 −0 tests/heron_validator/FARM_MIMO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/utils.py
+0 −0 tests/heron_validator/FARM_MIMO_StateVarSelect/stateVarSelection/svs_maker.py
+102 −0 tests/heron_validator/FARM_MIMO_StateVarSelect/stateVarSelection/svs_new_inputFile.xml
+12 −0 tests/heron_validator/FARM_MIMO_StateVarSelect/tests
+3 −0 tests/heron_validator/FARM_MIMO_initGuess_fmuUpdate/gold/Sweep_Runs_o/sweep.csv
+10 −12 tests/heron_validator/FARM_MIMO_initGuess_fmuUpdate/heron_input_FARM_MIMO_initGuess_fmuUpdate.xml
+0 −0 tests/heron_validator/FARM_MIMO_initGuess_fmuUpdate/plot_FARM_MIMO_SES_BOP_MW_Result.m
+2 −2 tests/heron_validator/FARM_MIMO_initGuess_fmuUpdate/tests
+0 −0 tests/heron_validator/FARM_MIMO_initGuess_fmuUpdate/transfers.py
+3 −0 tests/heron_validator/FARM_MIMO_initGuess_noUpdate/gold/Sweep_Runs_o/Linux_sweep.csv
+3 −0 tests/heron_validator/FARM_MIMO_initGuess_noUpdate/gold/Sweep_Runs_o/Mac_sweep.csv
+3 −0 tests/heron_validator/FARM_MIMO_initGuess_noUpdate/gold/Sweep_Runs_o/Windows_sweep.csv
+120 −0 tests/heron_validator/FARM_MIMO_initGuess_noUpdate/heron_input_FARM_MIMO_initGuess_noUpdate.xml
+0 −0 tests/heron_validator/FARM_MIMO_initGuess_noUpdate/plot_FARM_MIMO_SES_BOP_MW_Result.m
+7 −6 tests/heron_validator/FARM_MIMO_initGuess_noUpdate/tests
+0 −0 tests/heron_validator/FARM_MIMO_initGuess_noUpdate/transfers.py
+3 −0 tests/heron_validator/FARM_MIMO_selfLearning_fmuUpdate/gold/Sweep_Runs_o/sweep.csv
+9 −11 tests/heron_validator/FARM_MIMO_selfLearning_fmuUpdate/heron_input_FARM_MIMO_selfLearning_fmuUpdate.xml
+498 −0 tests/heron_validator/FARM_MIMO_selfLearning_fmuUpdate/plot_FARM_MIMO_SES_BOP_MW_Result.m
+14 −0 tests/heron_validator/FARM_MIMO_selfLearning_fmuUpdate/tests
+0 −0 tests/heron_validator/FARM_MIMO_selfLearning_fmuUpdate/transfers.py
+3 −0 tests/heron_validator/FARM_MIMO_selfLearning_noUpdate/gold/Sweep_Runs_o/sweep.csv
+120 −0 tests/heron_validator/FARM_MIMO_selfLearning_noUpdate/heron_input_FARM_MIMO_selfLearning_noUpdate.xml
+498 −0 tests/heron_validator/FARM_MIMO_selfLearning_noUpdate/plot_FARM_MIMO_SES_BOP_MW_Result.m
+14 −0 tests/heron_validator/FARM_MIMO_selfLearning_noUpdate/tests
+0 −0 tests/heron_validator/FARM_MIMO_selfLearning_noUpdate/transfers.py
+ − tests/heron_validator/FARM_SISO_StateVarSelect/FMUs/BOP_empty_MWinput.fmu
+ − tests/heron_validator/FARM_SISO_StateVarSelect/FMUs/SES_empty_MWinput.fmu
+ − tests/heron_validator/FARM_SISO_StateVarSelect/FMUs/TES_empty_MWinput.fmu
+0 −0 tests/heron_validator/FARM_SISO_StateVarSelect/gold/Sweep_Runs_o/sweep.csv
+0 −0 tests/heron_validator/FARM_SISO_StateVarSelect/gold/stateVarSelection/svs_new_inputFile.xml
+0 −0 ...ron_validator/FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/Prog_Test_DMDc_on_BOP.py
+0 −0 ...ron_validator/FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/Prog_Test_DMDc_on_SES.py
+0 −0 ...FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/simulatedDataBOP/DMDcCxCoeff_5400s.xml
+0 −0 ...FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/simulatedDataSES/DMDcCxCoeff_5400s.xml
+0 −0 tests/heron_validator/FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/svsTemplate.py
+0 −0 ...n_validator/FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/svs_inputFile_template.xml
+0 −0 ...s/heron_validator/FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/svs_template_input.i
+0 −0 tests/heron_validator/FARM_SISO_StateVarSelect/stateVarSelection/stateVarSelectionTemplate/utils.py
+0 −0 tests/heron_validator/FARM_SISO_StateVarSelect/stateVarSelection/svs_maker.py
+101 −0 tests/heron_validator/FARM_SISO_StateVarSelect/stateVarSelection/svs_new_inputFile.xml
+12 −0 tests/heron_validator/FARM_SISO_StateVarSelect/tests
+3 −0 tests/heron_validator/FARM_SISO_initGuess_fmuUpdate/gold/Sweep_Runs_o/sweep.csv
+18 −15 tests/heron_validator/FARM_SISO_initGuess_fmuUpdate/heron_input_FARM_SISO_initGuess_fmuUpdate.xml
+0 −0 tests/heron_validator/FARM_SISO_initGuess_fmuUpdate/plot_FARM_SISO_BOP_SES_MW_Result.m
+4 −3 tests/heron_validator/FARM_SISO_initGuess_fmuUpdate/tests
+0 −0 tests/heron_validator/FARM_SISO_initGuess_fmuUpdate/transfers.py
+3 −0 tests/heron_validator/FARM_SISO_initGuess_noUpdate/gold/Sweep_Runs_o/Linux_sweep.csv
+3 −0 tests/heron_validator/FARM_SISO_initGuess_noUpdate/gold/Sweep_Runs_o/Mac_sweep.csv
+3 −0 tests/heron_validator/FARM_SISO_initGuess_noUpdate/gold/Sweep_Runs_o/Windows_sweep.csv
+18 −17 tests/heron_validator/FARM_SISO_initGuess_noUpdate/heron_input_FARM_SISO_initGuess_noUpdate.xml
+0 −1 tests/heron_validator/FARM_SISO_initGuess_noUpdate/plot_FARM_SISO_BOP_SES_MW_Result.m
+8 −7 tests/heron_validator/FARM_SISO_initGuess_noUpdate/tests
+0 −0 tests/heron_validator/FARM_SISO_initGuess_noUpdate/transfers.py
+3 −0 tests/heron_validator/FARM_SISO_selfLearning_fmuUpdate/gold/Sweep_Runs_o/sweep.csv
+26 −19 tests/heron_validator/FARM_SISO_selfLearning_fmuUpdate/heron_input_FARM_SISO_selfLearning_fmuUpdate.xml
+81 −69 tests/heron_validator/FARM_SISO_selfLearning_fmuUpdate/plot_FARM_SISO_BOP_SES_MW_Result.m
+14 −0 tests/heron_validator/FARM_SISO_selfLearning_fmuUpdate/tests
+0 −0 tests/heron_validator/FARM_SISO_selfLearning_fmuUpdate/transfers.py
+3 −0 tests/heron_validator/FARM_SISO_selfLearning_noUpdate/gold/Sweep_Runs_o/sweep.csv
+28 −13 tests/heron_validator/FARM_SISO_selfLearning_noUpdate/heron_input_FARM_SISO_selfLearning_noUpdate.xml
+200 −0 tests/heron_validator/FARM_SISO_selfLearning_noUpdate/plot_FARM_SISO_BOP_SES_MW_Result.m
+14 −0 tests/heron_validator/FARM_SISO_selfLearning_noUpdate/tests
+91 −0 tests/heron_validator/FARM_SISO_selfLearning_noUpdate/transfers.py