Index: sources/model/dg/data/MDGReservoirData.cpp =================================================================== diff -u -r83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1 -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4 --- sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision 83d5e3ad3f8179b925e7ed6b06e1dcd44bec71b1) +++ sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4) @@ -1,14 +1,14 @@ /*! * - * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MDGReservoirData.cpp * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NematiPour + * \date (last) 31-Oct-2023 + * \author (original) Behrouz NemaiPour * \date (original) 02-Jul-2020 * */ @@ -30,9 +30,6 @@ _data.mTempAvgFill .value, _data.mTempLastFill .value, _data.mTimereservoirFill .value, - _data.mTempRsrvr0ActualTrimmer .value, - _data.mTempFillMixAvgTrimmer .value, - _data.mTempRsrvrEndFillTrimmer .value, }; } @@ -50,9 +47,6 @@ if (GetValue(vByteArray, index, _data.mTempAvgFill )) if (GetValue(vByteArray, index, _data.mTempLastFill )) if (GetValue(vByteArray, index, _data.mTimereservoirFill )) - if (GetValue(vByteArray, index, _data.mTempRsrvr0ActualTrimmer )) - if (GetValue(vByteArray, index, _data.mTempFillMixAvgTrimmer )) - if (GetValue(vByteArray, index, _data.mTempRsrvrEndFillTrimmer )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -66,9 +60,6 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } } /*! @@ -90,8 +81,5 @@ data.mTempAvgFill = _data.mTempAvgFill .value; data.mTempLastFill = _data.mTempLastFill .value; data.mTimereservoirFill = _data.mTimereservoirFill .value; - data.mTempRsrvr0ActualTrimmer = _data.mTempRsrvr0ActualTrimmer .value; - data.mTempFillMixAvgTrimmer = _data.mTempFillMixAvgTrimmer .value; - data.mTempRsrvrEndFillTrimmer = _data.mTempRsrvrEndFillTrimmer .value; return data; }