Fix Compiler Errors

[jkhillier]

Fixed the compiler errors as requested by Will.

There's then a make error, but one step at a time ....

make: *** [test/wavfilt.chk] Error 1

[wkearn]

There's then a make error, but one step at a time ....

make: *** [test/wavfilt.chk] Error 1

Do you get this error when you run your current code? I don't see it when I run it on my machine, and it is not showing up in our automated checks. Perhaps there are some platform-specific discrepancies (possibly floating point arithmetic differences) that we need to be checking for.

Do you see any additional output from make? There should also be a diff output from the failed test.

Otherwise, we just need to stop tracking the output files, see the comment here: https://github.com/TopoToolbox/SWT/pull/8/changes#r2946271913

[jkhillier]

Hi Will,

Two things. Sorry.

1. Running "git rm test/seamounts_output.txt" doesn't seem to work.

When running in the same directory that 'make check' functions in I get

John@gyjh5-mbp-2 SWT_compile_changes % git rm test/seamounts_output.txt
fatal: not a git repository (or any parent up to mount point /Volumes)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).

Please advise. Can I do this in GitHub desktop? I'm not sure that I've got the command line sorted for the whole setup.

2. I'm not sure what you mean by diff files. In /test/ there are .txt and .out files. Am I guessing correctly that .out is that produced by the compiled code, and .txt is the file that is 'correct' and being used as the check. However, what is output to the terminal window is as follows i.e. differences almost always in the 4th decimal place (and since this is meters height that really doesn't matter). So, I think you're right about the floating point arithmetic.

< 280.000000 -1084.643433 -1085.257812
---
> 280.000000 -1084.643433 -1085.257690
529c529
< 2640.000000 -1042.400024 -1048.980957
---
> 2640.000000 -1042.400024 -1048.980835
537c537
< 2680.000000 -1041.492920 -1048.022217
---
> 2680.000000 -1041.492920 -1048.022095
561c561
< 2800.000000 -1003.564941 -1011.333374
---
> 2800.000000 -1003.564941 -1011.333313
569c569
< 2840.000000 -1009.791199 -1011.866699
---
> 2840.000000 -1009.791199 -1011.866638
717c717
< 3580.000000 -987.270203 -1021.298462
---
> 3580.000000 -987.270203 -1021.298523
848c848
< 4235.000000 -992.973450 -998.057373
---
> 4235.000000 -992.973450 -998.057312
912c912
< 4555.000000 -936.938965 -994.906372
---
> 4555.000000 -936.938965 -994.906433
979c979
< 4890.000000 -976.700012 -980.463623
---
> 4890.000000 -976.700012 -980.463562
1271c1271
< 6350.000000 -853.868042 -979.848633
---
> 6350.000000 -853.868042 -979.848572
1448c1448
< 7235.000000 -899.203674 -972.062744
---
> 7235.000000 -899.203674 -972.062805
1484c1484
< 7415.000000 -889.452026 -970.479248
---
> 7415.000000 -889.452026 -970.479187
1748c1748
< 8735.000000 -976.660339 -997.648315
---
> 8735.000000 -976.660339 -997.648376
1863c1863
< 9310.000000 -960.407715 -1002.464844
---
> 9310.000000 -960.407715 -1002.464783
2175c2175
< 10870.000000 -1029.891846 -1030.605957
---
> 10870.000000 -1029.891846 -1030.606079
2183c2183
< 10910.000000 -1027.512817 -1029.566650
---
> 10910.000000 -1027.512817 -1029.566772
2357c2357
< 11780.000000 -945.777161 -1005.144897
---
> 11780.000000 -945.777161 -1005.144958
2587c2587
< 12930.000000 -1013.299988 -1015.194092
---
> 12930.000000 -1013.299988 -1015.194153
2715c2715
< 13570.000000 -1052.439087 -1053.703613
---
> 13570.000000 -1052.439087 -1053.703735
2877c2877
< 14380.000000 -1036.737427 -1047.021973
---
> 14380.000000 -1036.737427 -1047.022095
2964c2964
< 14815.000000 -1072.217773 -1072.424805
---
> 14815.000000 -1072.217773 -1072.424683

[jkhillier]

Ah, I think I got my directories confused. Now think I've removed the two test files you wanted me to and comitted and pushed.

[wkearn]

Excellent! I will merge this, then #4 so we get informed if any warnings pop up again. I will update the tests so that they allow for some floating point error. Then I will look through everything again, figure out what our next steps are and open some more issues to track our progress.

[wkearn]

That is merged into TopoToolbox/SWT#main now. You'll need to update your main branch locally with something like

$ git switch main
$ git pull upstream main

and then, if you want to update your fork on GitHub, something like

$ git push origin main

should work from the command line.