Changeset 6878 in ntrip

Timestamp:

Jun 3, 2015, 5:29:19 PM (9 years ago)

Author:

stuerze

Message:

SSR VTEC: consideration of the fact that max degree and order have to be included

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
• satObs.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -463 +463 @@
       t_vTecLayer layer;
       layer._height = ionoLayer.Height;
-      layer._C.ReSize(ionoLayer.Degree, ionoLayer.Order);
-      layer._S.ReSize(ionoLayer.Degree, ionoLayer.Order);
-      for (unsigned iDeg = 0; iDeg < ionoLayer.Degree; iDeg++) {
-        for (unsigned iOrd = 0; iOrd < ionoLayer.Order; iOrd++) {
+      layer._C.ReSize(ionoLayer.Degree+1, ionoLayer.Order+1);
+      layer._S.ReSize(ionoLayer.Degree+1, ionoLayer.Order+1);
+      for (unsigned iDeg = 0; iDeg <= ionoLayer.Degree; iDeg++) {
+        for (unsigned iOrd = 0; iOrd <= ionoLayer.Order; iOrd++) {
           layer._C[iDeg][iOrd] = ionoLayer.Cosinus[iDeg][iOrd];
           layer._S[iDeg][iOrd] = ionoLayer.Sinus[iDeg][iOrd];

trunk/BNC/src/satObs.cpp

@@ -299 +299 @@
     const t_vTecLayer& layer = vTec._layers[ii];
     *out << setw(2)  << ii+1 << ' '
-         << setw(2)  << layer._C.Nrows() << ' '    
-         << setw(2)  << layer._C.Ncols() << ' '    
+         << setw(2)  << layer._C.Nrows()-1 << ' '
+         << setw(2)  << layer._C.Ncols()-1 << ' '
          << setw(10) << setprecision(1) << layer._height << endl  
          << setw(10) << setprecision(4) << layer._C 
@@ -334 +334 @@
     in >> dummy >> maxDeg >> maxOrd >> layer._height;
 
-    layer._C.ReSize(maxDeg, maxOrd);
-    layer._S.ReSize(maxDeg, maxOrd);
-
-    for (int iDeg = 0; iDeg < maxDeg; iDeg++) {
-      for (int iOrd = 0; iOrd < maxOrd; iOrd++) {
+    layer._C.ReSize(maxDeg+1, maxOrd+1);
+    layer._S.ReSize(maxDeg+1, maxOrd+1);
+
+    for (int iDeg = 0; iDeg <= maxDeg; iDeg++) {
+      for (int iOrd = 0; iOrd <= maxOrd; iOrd++) {
         inStream >> layer._C[iDeg][iOrd];
       }
     }
-    for (int iDeg = 0; iDeg < maxDeg; iDeg++) {
-      for (int iOrd = 0; iOrd < maxOrd; iOrd++) {
+    for (int iDeg = 0; iDeg <= maxDeg; iDeg++) {
+      for (int iOrd = 0; iOrd <= maxOrd; iOrd++) {
         inStream >> layer._S[iDeg][iOrd];
       }