Skip to content

Commit 67eda1f

Browse files
rogerfraserrogerfraser
committed
Merge remote-tracking branch 'upstream/1.2.9' into 1.2.9
2 parents 301d6a2 + f877619 commit 67eda1f

File tree

105 files changed

+6438
-3114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+6438
-3114
lines changed

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BasedOnStyle: LLVM
1+
BasedOnStyle: Google
22
Language: Cpp
33
IndentWidth: 4
44
TabWidth: 4

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -317,31 +317,8 @@ jobs:
317317
mkdir -p release
318318
mkdir -p release/DynAdjust-Windows
319319
echo "Copying files into release folder"
320-
cp -f ./src/dynadjust/dnageoid/Release/*.dll ./release/DynAdjust-Windows/ || true
321-
cp -f ./src/dynadjust/dnageoidwrapper/Release/*.dll ./release/DynAdjust-Windows/ || true
322-
cp -f ./src/dynadjust/dnageoidwrapper/Release/*.exe ./release/DynAdjust-Windows/ || true
323-
cp -f ./src/dynadjust/dnaimport/Release/*.dll release/DynAdjust-Windows/ || true
324-
cp -f ./src/dynadjust/dnaimportwrapper/Release/*.dll ./release/DynAdjust-Windows/ || true
325-
cp -f ./src/dynadjust/dnaimportwrapper/Release/*.exe ./release/DynAdjust-Windows/ || true
326-
cp -f ./src/dynadjust/dnaplot/Release/*.dll ./release/DynAdjust-Windows/ || true
327-
cp -f ./src/dynadjust/dnaplotwrapper/Release/*.dll ./release/DynAdjust-Windows/ || true
328-
cp -f ./src/dynadjust/dnaplotwrapper/Release/*.exe ./release/DynAdjust-Windows/ || true
329-
cp -f ./src/dynadjust/dnareftran/Release/*.dll ./release/DynAdjust-Windows/ || true
330-
cp -f ./src/dynadjust/dnareftranwrapper/Release/*.dll ./release/DynAdjust-Windows/ || true
331-
cp -f ./src/dynadjust/dnareftranwrapper/Release/*.exe ./release/DynAdjust-Windows/ || true
332-
cp -f ./src/dynadjust/dnasegment/Release/*.dll ./release/DynAdjust-Windows/ || true
333-
cp -f ./src/dynadjust/dnasegmentwrapper/Release/*.dll ./release/DynAdjust-Windows/ || true
334-
cp -f ./src/dynadjust/dnasegmentwrapper/Release/*.exe ./release/DynAdjust-Windows/ || true
335-
cp -f ./src/dynadjust/dnaadjust/Release/*.dll ./release/DynAdjust-Windows/ || true
336-
cp -f ./src/dynadjust/dnaadjustwrapper/Release/*.dll ./release/DynAdjust-Windows/ || true
337-
cp -f ./src/dynadjust/dnaadjustwrapper/Release/*.exe ./release/DynAdjust-Windows/ || true
338-
echo "Renaming files to add dna prefix"
339-
mv ./release/DynAdjust-Windows/adjust.exe ./release/DynAdjust-Windows/dnaadjust.exe || true
340-
mv ./release/DynAdjust-Windows/geoid.exe ./release/DynAdjust-Windows/dnageoid.exe || true
341-
mv ./release/DynAdjust-Windows/import.exe ./release/DynAdjust-Windows/dnaimport.exe || true
342-
mv ./release/DynAdjust-Windows/plot.exe ./release/DynAdjust-Windows/dnaplot.exe || true
343-
mv ./release/DynAdjust-Windows/reftran.exe ./release/DynAdjust-Windows/dnareftran.exe || true
344-
mv ./release/DynAdjust-Windows/segment.exe ./release/DynAdjust-Windows/dnasegment.exe || true
320+
cp -f ./src/x64/Release/*.dll ./release/DynAdjust-Windows/
321+
cp -f ./src/x64/Release/*.exe ./release/DynAdjust-Windows/
345322
346323
- uses: actions/upload-artifact@v4
347324
with:
@@ -426,31 +403,8 @@ jobs:
426403
mkdir -p release
427404
mkdir -p release/DynAdjust-Windows
428405
echo "Copying files into release folder"
429-
cp -f ./src/dynadjust/dnageoid/Release/*.dll ./release/DynAdjust-Windows/
430-
cp -f ./src/dynadjust/dnageoidwrapper/Release/*.dll ./release/DynAdjust-Windows/
431-
cp -f ./src/dynadjust/dnageoidwrapper/Release/*.exe ./release/DynAdjust-Windows/
432-
cp -f ./src/dynadjust/dnaimport/Release/*.dll release/DynAdjust-Windows/
433-
cp -f ./src/dynadjust/dnaimportwrapper/Release/*.dll ./release/DynAdjust-Windows/
434-
cp -f ./src/dynadjust/dnaimportwrapper/Release/*.exe ./release/DynAdjust-Windows/
435-
cp -f ./src/dynadjust/dnaplot/Release/*.dll ./release/DynAdjust-Windows/
436-
cp -f ./src/dynadjust/dnaplotwrapper/Release/*.dll ./release/DynAdjust-Windows/
437-
cp -f ./src/dynadjust/dnaplotwrapper/Release/*.exe ./release/DynAdjust-Windows/
438-
cp -f ./src/dynadjust/dnareftran/Release/*.dll ./release/DynAdjust-Windows/
439-
cp -f ./src/dynadjust/dnareftranwrapper/Release/*.dll ./release/DynAdjust-Windows/
440-
cp -f ./src/dynadjust/dnareftranwrapper/Release/*.exe ./release/DynAdjust-Windows/
441-
cp -f ./src/dynadjust/dnasegment/Release/*.dll ./release/DynAdjust-Windows/
442-
cp -f ./src/dynadjust/dnasegmentwrapper/Release/*.dll ./release/DynAdjust-Windows/
443-
cp -f ./src/dynadjust/dnasegmentwrapper/Release/*.exe ./release/DynAdjust-Windows/
444-
cp -f ./src/dynadjust/dnaadjust/Release/*.dll ./release/DynAdjust-Windows/
445-
cp -f ./src/dynadjust/dnaadjustwrapper/Release/*.dll ./release/DynAdjust-Windows/
446-
cp -f ./src/dynadjust/dnaadjustwrapper/Release/*.exe ./release/DynAdjust-Windows/
447-
echo "Renaming files to add dna prefix"
448-
mv ./release/DynAdjust-Windows/adjust.exe ./release/DynAdjust-Windows/dnaadjust.exe
449-
mv ./release/DynAdjust-Windows/geoid.exe ./release/DynAdjust-Windows/dnageoid.exe
450-
mv ./release/DynAdjust-Windows/import.exe ./release/DynAdjust-Windows/dnaimport.exe
451-
mv ./release/DynAdjust-Windows/plot.exe ./release/DynAdjust-Windows/dnaplot.exe
452-
mv ./release/DynAdjust-Windows/reftran.exe ./release/DynAdjust-Windows/dnareftran.exe
453-
mv ./release/DynAdjust-Windows/segment.exe ./release/DynAdjust-Windows/dnasegment.exe
406+
cp -f ./src/x64/Release/*.dll ./release/DynAdjust-Windows/
407+
cp -f ./src/x64/Release/*.exe ./release/DynAdjust-Windows/
454408
455409
- uses: actions/upload-artifact@v4
456410
with:

‎dynadjust/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ option(USE_MKL "Use Intel MKL (Linux and Windows)" OFF)
77
option(USE_OPENMP_MAC "Use OpenMP on macOS (requires `brew install libomp`)" OFF)
88
option(ILP64 "Use ILP64 Interface for BLAS and LAPACK" OFF)
99

10+
set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
11+
1012
# Fix Boost 1.70+ issue with CMake 3.14+
1113
if(POLICY CMP0167)
1214
cmake_policy(SET CMP0167 NEW)

‎dynadjust/dynadjust/dnaadjust/CMakeLists.txt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ add_definitions(-DBUILD_DNAADJUST_DLL -DBUILD_EXPORTDNATYPES)
77
include_directories (${PROJECT_SOURCE_DIR})
88

99
add_library (${PROJECT_NAME} SHARED
10-
${CMAKE_SOURCE_DIR}/include/io/dnaioadj.cpp
11-
${CMAKE_SOURCE_DIR}/include/io/dnaioaml.cpp
12-
${CMAKE_SOURCE_DIR}/include/io/dnaioasl.cpp
13-
${CMAKE_SOURCE_DIR}/include/io/dnaiobase.cpp
14-
${CMAKE_SOURCE_DIR}/include/io/dnaiobms.cpp
15-
${CMAKE_SOURCE_DIR}/include/io/dnaiobst.cpp
16-
${CMAKE_SOURCE_DIR}/include/io/dnaiomap.cpp
17-
${CMAKE_SOURCE_DIR}/include/io/dnaioseg.cpp
10+
${CMAKE_SOURCE_DIR}/include/io/adj_file.cpp
11+
${CMAKE_SOURCE_DIR}/include/io/aml_file.cpp
12+
${CMAKE_SOURCE_DIR}/include/io/asl_file.cpp
13+
${CMAKE_SOURCE_DIR}/include/io/dynadjust_file.cpp
14+
${CMAKE_SOURCE_DIR}/include/io/bms_file.cpp
15+
${CMAKE_SOURCE_DIR}/include/io/bst_file.cpp
16+
${CMAKE_SOURCE_DIR}/include/io/map_file.cpp
17+
${CMAKE_SOURCE_DIR}/include/io/seg_file.cpp
1818
${CMAKE_SOURCE_DIR}/include/io/dnaiotbu.cpp
1919
${CMAKE_SOURCE_DIR}/include/io/dnaiosnxwrite.cpp
2020
${CMAKE_SOURCE_DIR}/include/parameters/dnadatum.cpp
@@ -27,6 +27,8 @@ add_library (${PROJECT_NAME} SHARED
2727
${CMAKE_SOURCE_DIR}/include/measurement_types/dnastation.cpp
2828
${CMAKE_SOURCE_DIR}/include/measurement_types/dnamsrtally.cpp
2929
${CMAKE_SOURCE_DIR}/include/memory/dnafile_mapping.cpp
30+
network_data_loader.cpp
31+
measurement_processor.cpp
3032
dnaadjust-stage.cpp
3133
dnaadjust.cpp
3234
${CMAKE_SOURCE_DIR}/dynadjust.rc)

‎dynadjust/dynadjust/dnaadjust/dnaadjust-multi.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
//============================================================================
22
// Name : dnaadjust-multi.cpp
33
// Author : Roger Fraser
4-
// Contributors :
5-
// Version : 1.00
6-
// Copyright : Copyright 2017 Geoscience Australia
4+
// Contributors : Dale Roberts <[email protected]>
5+
// Copyright : Copyright 2017-2025 Geoscience Australia
76
//
87
// Licensed under the Apache License, Version 2.0 (the "License");
98
// you may not use this file except in compliance with the License.

‎dynadjust/dynadjust/dnaadjust/dnaadjust-stage.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
//============================================================================
22
// Name : dnaadjust-stage.cpp
33
// Author : Roger Fraser
4-
// Contributors :
5-
// Version : 1.00
6-
// Copyright : Copyright 2017 Geoscience Australia
4+
// Contributors : Dale Roberts <[email protected]>
5+
// Copyright : Copyright 2017-2025 Geoscience Australia
76
//
87
// Licensed under the Apache License, Version 2.0 (the "License");
98
// you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)