Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/v2.9.0' into v2.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dzalkind committed Jan 5, 2024
2 parents c29fc85 + 75c3d29 commit 99c9f87
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rosco/controller/src/ReadSetParameters.f90
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ SUBROUTINE ReadControlParameterFileSub(CntrPar, LocalVar, accINFILE, accINFILE_s
!----------------- FILTER CONSTANTS ---------------------
CALL ParseInput(FileLines, 'F_LPFCornerFreq', CntrPar%F_LPFCornerFreq, accINFILE(1), ErrVar, .FALSE., UnEc)
CALL ParseInput(FileLines, 'F_LPFDamping', CntrPar%F_LPFDamping, accINFILE(1), ErrVar, CntrPar%F_LPFType == 1, UnEc)
CALL ParseInput(FileLines, 'F_NumNotchFilts', CntrPar%F_NumNotchFilts, accINFILE(1), ErrVar, .FALSE., UnEc)
CALL ParseInput(FileLines, 'F_NumNotchFilts', CntrPar%F_NumNotchFilts, accINFILE(1), ErrVar, .TRUE., UnEc)
CALL ParseAry( FileLines, 'F_NotchFreqs', CntrPar%F_NotchFreqs, CntrPar%F_NumNotchFilts, accINFILE(1), ErrVar, CntrPar%F_NumNotchFilts == 0, UnEc)
CALL ParseAry( FileLines, 'F_NotchBetaNum', CntrPar%F_NotchBetaNum, CntrPar%F_NumNotchFilts, accINFILE(1), ErrVar, CntrPar%F_NumNotchFilts == 0, UnEc)
CALL ParseAry( FileLines, 'F_NotchBetaDen', CntrPar%F_NotchBetaDen, CntrPar%F_NumNotchFilts, accINFILE(1), ErrVar, CntrPar%F_NumNotchFilts == 0, UnEc)
Expand Down

0 comments on commit 99c9f87

Please sign in to comment.