Index: sources/model/dg/data/MDDConductivityData.cpp =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/model/dg/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/model/dg/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision 148e4803af29502875b08875f171e284398db34e) @@ -22,10 +22,7 @@ _data.mCD2 .value, _data.mCD3 .value, _data.mCD4 .value, - _data.mTD1 .value, - _data.mTD2 .value, - _data.mTD3 .value, - _data.mTD4 .value, + _data.mCD5 .value, }; } @@ -35,10 +32,7 @@ if ( ! GetValue(vByteArray, index, _data.mCD2 )) goto lError; if ( ! GetValue(vByteArray, index, _data.mCD3 )) goto lError; if ( ! GetValue(vByteArray, index, _data.mCD4 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTD1 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTD2 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTD3 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTD4 )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCD5 )) goto lError; return true ; @@ -59,9 +53,6 @@ data.mCD2 = _data.mCD2 .value; data.mCD3 = _data.mCD3 .value; data.mCD4 = _data.mCD4 .value; - data.mTD1 = _data.mTD1 .value; - data.mTD2 = _data.mTD2 .value; - data.mTD3 = _data.mTD3 .value; - data.mTD4 = _data.mTD4 .value; + data.mCD5 = _data.mCD5 .value; return data; }