Merge pull request #213 from icsm-au/1.2.7

Version 1.2.7 (various fixes and enhancements)

Dockerfile

@@ -21,9 +21,9 @@ RUN apt-get update &&\
  apt-get install -y --no-install-recommends g++ &&\
  apt-get install -y --no-install-recommends xsdcxx
 RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-RUN apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB 
+RUN apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 RUN add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
-RUN apt install -y intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mkl-devel intel-oneapi-tbb-devel 
+RUN apt install -y intel-oneapi-compiler-dpcpp-cpp intel-oneapi-mkl-devel intel-oneapi-tbb-devel
 RUN apt-get -y install cpio &&\
  cd ./DynAdjust &&\
  chmod +x ./resources/make_dynadjust_gcc.sh &&\

dynadjust/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.15)
 
 project (dynadjust)
 
-set (DYNADJUST_VERSION "1.2.6")
+set (DYNADJUST_VERSION "1.2.7")
 
 if (BUILD_TESTING)
     enable_testing()
@@ -316,6 +316,7 @@ if (BUILD_TESTING)
     add_test (NAME ref-gnss11-network COMMAND $<TARGET_FILE:dnareftranwrapper> gnss -r itrf1994)
     add_test (NAME ref-gnss12-network COMMAND $<TARGET_FILE:dnareftranwrapper> gnss -r itrf1996)
     add_test (NAME ref-gnss13-network COMMAND $<TARGET_FILE:dnareftranwrapper> gnss -r itrf1997)
+    add_test (NAME ref-gnss14-network COMMAND $<TARGET_FILE:dnareftranwrapper> gnss -r itrf2020)
 
     # 9. gnss reference frame transformations with plate motion model
     add_test (NAME ref-itrf-pmm-01 COMMAND $<TARGET_FILE:dnaimportwrapper> -n itrf05_itrf1997_a -r itrf2005 ${CMAKE_SOURCE_DIR}/../sampleData/TEST_ITRF05.SNX)
@@ -396,13 +397,14 @@ if (BUILD_TESTING)
     add_test (NAME dyn-help-02 COMMAND $<TARGET_FILE:dynadjust> --help-module generic)
     add_test (NAME dyn-version-01 COMMAND $<TARGET_FILE:dynadjust> --version)
 
-    # 13. Handle database id, output measurement to stations, output adjustment information on each iteration, scale normals to unity, report results
+    # 13. Handle database id, output measurement to stations, output adjustment information on each iteration, scale normals to unity, report results, type-b
     add_test (NAME import-dbid COMMAND $<TARGET_FILE:dnaimportwrapper> -n dbid ${CMAKE_SOURCE_DIR}/../sampleData/dsg.stn ${CMAKE_SOURCE_DIR}/../sampleData/dsg.msr ${CMAKE_SOURCE_DIR}/../sampleData/dsg-ignored.msr) 
     add_test (NAME adjust-dbid-01 COMMAND $<TARGET_FILE:dnaadjustwrapper> dbid --output-adj-msr --output-database-ids --output-ignored-msrs --sort-adj-msr-field 6 --output-msr-to-stn --sort-msr-to-stn-field 1 --output-iter-adj-stn --output-iter-adj-stat --output-iter-adj-msr --output-iter-cmp-msr)
     add_test (NAME adjust-dbid-02 COMMAND $<TARGET_FILE:dnaadjustwrapper> dbid --scale-normals-to-unity)
     add_test (NAME adjust-dbid-03 COMMAND $<TARGET_FILE:dnaadjustwrapper> dbid --report-results --output-adj-msr --output-pos-uncertainty --output-apu-vcv-units 1 --constraints "236300210,CCC")
     add_test (NAME adjust-dbid-04 COMMAND $<TARGET_FILE:dnaadjustwrapper> dbid --comments "This is a comment that is quite lengthy in content and is relatively meaningless.  Feel free to delete this comment.")
     add_test (NAME adjust-dbid-05 COMMAND $<TARGET_FILE:dnaadjustwrapper> -p dbid.dnaproj)
+    add_test (NAME adjust-dbid-06 COMMAND $<TARGET_FILE:dnaadjustwrapper> dbid --type-b-sd-glob "0.01,0.01,0.035" --type-b-sd-file ${CMAKE_SOURCE_DIR}/../sampleData/dsg.typeb --output-pos)
 
     # 13. Renaming, no export of flagged stations, no network name, non-contiguous networks, import block, nearby stations
     add_test (NAME import-misc-01 COMMAND $<TARGET_FILE:dnaimportwrapper> -n misc ${CMAKE_SOURCE_DIR}/../sampleData/dsg.stn ${CMAKE_SOURCE_DIR}/../sampleData/dsg.msr ${CMAKE_SOURCE_DIR}/../sampleData/dsg-ignored.msr --stn-renaming-file ${CMAKE_SOURCE_DIR}/../sampleData/dsg.renaming --export-xml)

dynadjust/dynadjust.rc

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,6,0
- PRODUCTVERSION 1,2,6,0
+ FILEVERSION 1,2,7,0
+ PRODUCTVERSION 1,2,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -42,12 +42,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "DynAdjust is a rigorous, high performance least squares adjustment application."
-            VALUE "FileVersion", "1.2.6.0"
+            VALUE "FileVersion", "1.2.7.0"
             VALUE "InternalName", "DynAdjust"
             VALUE "LegalCopyright", "Copyright 2022 Geoscience Australia"
             VALUE "OriginalFilename", "DynAdjust"
             VALUE "ProductName", "DynAdjust"
-            VALUE "ProductVersion", "1.2.6.0"
+            VALUE "ProductVersion", "1.2.7.0"
         END
     END
     BLOCK "VarFileInfo"

dynadjust/dynadjust/dnaadjust/CMakeLists.txt

@@ -14,6 +14,7 @@ add_library (${PROJECT_NAME} SHARED
              ${CMAKE_SOURCE_DIR}/include/io/dnaiobst.cpp
              ${CMAKE_SOURCE_DIR}/include/io/dnaiomap.cpp
              ${CMAKE_SOURCE_DIR}/include/io/dnaioseg.cpp
+             ${CMAKE_SOURCE_DIR}/include/io/dnaiotbu.cpp
              ${CMAKE_SOURCE_DIR}/include/io/dnaiosnxwrite.cpp
              ${CMAKE_SOURCE_DIR}/include/parameters/dnadatum.cpp
              ${CMAKE_SOURCE_DIR}/include/parameters/dnaellipsoid.cpp