diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | exodusii/exodus-6.02-testresults.patch | 677 | ||||
| -rw-r--r-- | exodusii/sovers.diff | 104 |
3 files changed, 782 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b3b1b04..eff9764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - PKG=$(git log -1 --pretty=%s | sed 's/:.*//') - if [[ ! -d ${PKG} ]]; then echo "Directory ${PKG} not found"; exit 1; fi - if [[ ! -f ${PKG}/${PKG}.spec ]]; then echo "No spec file (${PKG}.spec found in directory ${PKG}"; exit 1; fi - - echo "dnf -y install fedora-review && rpmbuild -D'_sourcedir /travis/${PKG}' -D'_srcrpmdir /travis/${PKG}' -bs /travis/${PKG}/${PKG}.spec" > review.sh + - echo "dnf -y install fedora-review && newgrp mock && cd /travis/${PKG} && rpmbuild -D'_sourcedir /travis/${PKG}' -D'_srcrpmdir /travis/${PKG}' -bs ${PKG}.spec && fedora-review -n ${PKG}" > review.sh - chmod +x review.sh - cat review.sh - docker run -v "${PWD}:/travis:rw" -it fedora /bin/bash /travis/review.sh diff --git a/exodusii/exodus-6.02-testresults.patch b/exodusii/exodus-6.02-testresults.patch new file mode 100644 index 0000000..de1eb26 --- /dev/null +++ b/exodusii/exodus-6.02-testresults.patch @@ -0,0 +1,677 @@ +From: Christoph Junghans <junghans@votca.org> +Date: 2016-09-09 + +Newer versions of netcdf's ncdump prints stuff in a diffent order + +diff -Naur exodus-6.02.orig/exodus/cbind/test/test1.dmp exodus-6.02/exodus/cbind/test/test1.dmp +--- exodus-6.02.orig/exodus/cbind/test/test1.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/test1.dmp 2016-09-09 10:59:34.378167558 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 28 ; + num_elem = 8 ; +@@ -174,9 +174,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is testwt1" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/test2-1.dmp exodus-6.02/exodus/cbind/test/test2-1.dmp +--- exodus-6.02.orig/exodus/cbind/test/test2-1.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/test2-1.dmp 2016-09-09 10:59:34.378167558 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -137,9 +137,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/test2-2.dmp exodus-6.02/exodus/cbind/test/test2-2.dmp +--- exodus-6.02.orig/exodus/cbind/test/test2-2.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/test2-2.dmp 2016-09-09 10:59:34.379167514 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -137,9 +137,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is test 2" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/test2.dmp exodus-6.02/exodus/cbind/test/test2.dmp +--- exodus-6.02.orig/exodus/cbind/test/test2.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/test2.dmp 2016-09-09 10:59:34.379167514 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -119,9 +119,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/test_clb.dmp exodus-6.02/exodus/cbind/test/test_clb.dmp +--- exodus-6.02.orig/exodus/cbind/test/test_clb.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/test_clb.dmp 2016-09-09 10:59:34.376167648 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -184,9 +184,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testcp_dd.dmp exodus-6.02/exodus/cbind/test/testcp_dd.dmp +--- exodus-6.02.orig/exodus/cbind/test/testcp_dd.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testcp_dd.dmp 2016-09-09 10:59:34.377167603 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -108,9 +108,9 @@ + // global attributes: + :floating_point_word_size = 8 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testcp_ds.dmp exodus-6.02/exodus/cbind/test/testcp_ds.dmp +--- exodus-6.02.orig/exodus/cbind/test/testcp_ds.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testcp_ds.dmp 2016-09-09 10:59:34.377167603 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -108,9 +108,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testcp_ln.dmp exodus-6.02/exodus/cbind/test/testcp_ln.dmp +--- exodus-6.02.orig/exodus/cbind/test/testcp_ln.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testcp_ln.dmp 2016-09-09 10:49:44.526607479 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -126,9 +126,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 0 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testcp_nl.dmp exodus-6.02/exodus/cbind/test/testcp_nl.dmp +--- exodus-6.02.orig/exodus/cbind/test/testcp_nl.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testcp_nl.dmp 2016-09-09 10:55:56.609928955 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -128,9 +128,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testcp_sd.dmp exodus-6.02/exodus/cbind/test/testcp_sd.dmp +--- exodus-6.02.orig/exodus/cbind/test/testcp_sd.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testcp_sd.dmp 2016-09-09 10:47:39.467213229 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -128,9 +128,9 @@ + // global attributes: + :floating_point_word_size = 8 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testcp_ss.dmp exodus-6.02/exodus/cbind/test/testcp_ss.dmp +--- exodus-6.02.orig/exodus/cbind/test/testcp_ss.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testcp_ss.dmp 2016-09-09 10:46:42.709757365 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -128,9 +128,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testd.dmp exodus-6.02/exodus/cbind/test/testd.dmp +--- exodus-6.02.orig/exodus/cbind/test/testd.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testd.dmp 2016-09-09 10:59:34.377167603 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -137,9 +137,9 @@ + // global attributes: + :floating_point_word_size = 8 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/test.dmp exodus-6.02/exodus/cbind/test/test.dmp +--- exodus-6.02.orig/exodus/cbind/test/test.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/test.dmp 2016-09-09 10:46:09.497246106 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -188,9 +188,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testwt-long-name.dmp exodus-6.02/exodus/cbind/test/testwt-long-name.dmp +--- exodus-6.02.orig/exodus/cbind/test/testwt-long-name.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testwt-long-name.dmp 2016-09-09 10:59:34.381167424 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 128 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -188,9 +188,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 64 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 64 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testwt-nfaced.dmp exodus-6.02/exodus/cbind/test/testwt-nfaced.dmp +--- exodus-6.02.orig/exodus/cbind/test/testwt-nfaced.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testwt-nfaced.dmp 2016-09-09 10:59:34.380167469 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 14 ; + num_elem = 3 ; +@@ -47,9 +47,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testwt-nsided.dmp exodus-6.02/exodus/cbind/test/testwt-nsided.dmp +--- exodus-6.02.orig/exodus/cbind/test/testwt-nsided.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testwt-nsided.dmp 2016-09-09 10:59:34.380167469 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -122,9 +122,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testwt_ss.dmp exodus-6.02/exodus/cbind/test/testwt_ss.dmp +--- exodus-6.02.orig/exodus/cbind/test/testwt_ss.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testwt_ss.dmp 2016-09-09 10:59:34.378167558 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 8 ; +@@ -118,9 +118,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testwt-zeroe.dmp exodus-6.02/exodus/cbind/test/testwt-zeroe.dmp +--- exodus-6.02.orig/exodus/cbind/test/testwt-zeroe.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testwt-zeroe.dmp 2016-09-09 10:59:34.380167469 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_node_sets = 2 ; +@@ -44,9 +44,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/cbind/test/testwt-zeron.dmp exodus-6.02/exodus/cbind/test/testwt-zeron.dmp +--- exodus-6.02.orig/exodus/cbind/test/testwt-zeron.dmp 2016-09-09 11:05:45.106549769 -0600 ++++ exodus-6.02/exodus/cbind/test/testwt-zeron.dmp 2016-09-09 10:59:34.379167514 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 1 ; + num_qa_rec = 2 ; + num_info = 3 ; +@@ -20,9 +20,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/test1.dmp exodus-6.02/exodus/forbind/test/test1.dmp +--- exodus-6.02.orig/exodus/forbind/test/test1.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/test1.dmp 2016-09-09 11:03:20.246043098 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 28 ; + num_elem = 8 ; +@@ -174,9 +174,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is testwt1" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/test2-1.dmp exodus-6.02/exodus/forbind/test/test2-1.dmp +--- exodus-6.02.orig/exodus/forbind/test/test2-1.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/test2-1.dmp 2016-09-09 11:03:20.246043098 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -137,9 +137,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is test 2" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/test2-2.dmp exodus-6.02/exodus/forbind/test/test2-2.dmp +--- exodus-6.02.orig/exodus/forbind/test/test2-2.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/test2-2.dmp 2016-09-09 11:03:20.246043098 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -137,9 +137,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is test 2" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/testcpln.dmp exodus-6.02/exodus/forbind/test/testcpln.dmp +--- exodus-6.02.orig/exodus/forbind/test/testcpln.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/testcpln.dmp 2016-09-09 11:03:20.243043233 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -106,9 +106,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 0 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/testcpnl.dmp exodus-6.02/exodus/forbind/test/testcpnl.dmp +--- exodus-6.02.orig/exodus/forbind/test/testcpnl.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/testcpnl.dmp 2016-09-09 11:03:20.243043233 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -108,9 +108,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/testcp_ss.dmp exodus-6.02/exodus/forbind/test/testcp_ss.dmp +--- exodus-6.02.orig/exodus/forbind/test/testcp_ss.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/testcp_ss.dmp 2016-09-09 11:03:20.243043233 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -108,9 +108,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1, 1, 1, 1, 1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/testd.dmp exodus-6.02/exodus/forbind/test/testd.dmp +--- exodus-6.02.orig/exodus/forbind/test/testd.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/testd.dmp 2016-09-09 11:03:20.246043098 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 2 ; + num_nodes = 8 ; + num_elem = 2 ; +@@ -97,9 +97,9 @@ + // global attributes: + :floating_point_word_size = 8 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/test.dmp exodus-6.02/exodus/forbind/test/test.dmp +--- exodus-6.02.orig/exodus/forbind/test/test.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/test.dmp 2016-09-09 11:03:20.243043233 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (10 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (10 currently) + num_dim = 3 ; + num_nodes = 26 ; + num_elem = 5 ; +@@ -137,9 +137,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + time_whole = 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1 ; +diff -Naur exodus-6.02.orig/exodus/forbind/test/test-nsided.dmp exodus-6.02/exodus/forbind/test/test-nsided.dmp +--- exodus-6.02.orig/exodus/forbind/test/test-nsided.dmp 2016-09-09 11:05:45.124548962 -0600 ++++ exodus-6.02/exodus/forbind/test/test-nsided.dmp 2016-09-09 11:03:20.246043098 -0600 +@@ -3,8 +3,8 @@ + len_string = 33 ; + len_line = 81 ; + four = 4 ; +- time_step = UNLIMITED ; // (0 currently) + len_name = 33 ; ++ time_step = UNLIMITED ; // (0 currently) + num_dim = 3 ; + num_nodes = 33 ; + num_elem = 7 ; +@@ -40,9 +40,9 @@ + // global attributes: + :floating_point_word_size = 4 ; + :file_size = 1 ; ++ :maximum_name_length = 32 ; + :int64_status = 0 ; + :title = "This is a test" ; +- :maximum_name_length = 32 ; + data: + + eb_status = 1 ; diff --git a/exodusii/sovers.diff b/exodusii/sovers.diff new file mode 100644 index 0000000..0f46fd8 --- /dev/null +++ b/exodusii/sovers.diff @@ -0,0 +1,104 @@ +From: Jan Engelhardt <jengelh@inai.de> +Date: 2016-05-26 09:42:00.089515862 +0200 + +Shared libraries must change their SONAME when an ABI change occurs. Without +any versioning, this won't occur, so add versions as per +https://en.opensuse.org/openSUSE:Shared_library_packaging_policy. + +--- + exodus/cbind/CMakeLists.txt | 10 +++++----- + exodus/cbind/test/CMakeLists.txt | 4 ++-- + exodus/forbind/CMakeLists.txt | 8 ++++---- + exodus/forbind/test/CMakeLists.txt | 2 +- + 4 files changed, 12 insertions(+), 12 deletions(-) + +Index: exodus-6.02/exodus/cbind/CMakeLists.txt +=================================================================== +--- exodus-6.02.orig/exodus/cbind/CMakeLists.txt ++++ exodus-6.02/exodus/cbind/CMakeLists.txt +@@ -276,20 +276,20 @@ IF(APPLE) + COMPILE_FLAGS -fno-common) + ENDIF(APPLE) + +-ADD_LIBRARY(exoIIv2c ${EXODUS_LIBRARY_TYPE} ${cbind_SRCS}) ++ADD_LIBRARY(exoIIv2c-${EXODUSII_VERSION_FULL} ${EXODUS_LIBRARY_TYPE} ${cbind_SRCS}) + +-TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY} ${ZLIB_LIBRARY}) ++TARGET_LINK_LIBRARIES(exoIIv2c-${EXODUSII_VERSION_FULL} ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY} ${ZLIB_LIBRARY}) + + IF(MSVC) +- set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS) ++ set_target_properties(exoIIv2c-${EXODUSII_VERSION_FULL} PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS) + ENDIF(MSVC) + + IF(EXODUS_LIBRARY_PROPERTIES) +- SET_TARGET_PROPERTIES(exoIIv2c PROPERTIES ${EXODUS_LIBRARY_PROPERTIES}) ++ SET_TARGET_PROPERTIES(exoIIv2c-${EXODUSII_VERSION_FULL} PROPERTIES ${EXODUS_LIBRARY_PROPERTIES}) + ENDIF(EXODUS_LIBRARY_PROPERTIES) + + IF(NOT EXODUS_INSTALL_NO_LIBRARIES) +- INSTALL(TARGETS exoIIv2c ++ INSTALL(TARGETS exoIIv2c-${EXODUSII_VERSION_FULL} + RUNTIME DESTINATION lib COMPONENT Runtime + LIBRARY DESTINATION lib COMPONENT Runtime + ARCHIVE DESTINATION lib COMPONENT Development) +Index: exodus-6.02/exodus/cbind/test/CMakeLists.txt +=================================================================== +--- exodus-6.02.orig/exodus/cbind/test/CMakeLists.txt ++++ exodus-6.02/exodus/cbind/test/CMakeLists.txt +@@ -17,7 +17,7 @@ CREATE_TEST_SOURCELIST( ExoIICTests + ) + + ADD_EXECUTABLE( ExoIICTests ${ExoIICTests} ) +-TARGET_LINK_LIBRARIES( ExoIICTests exoIIv2c ) ++TARGET_LINK_LIBRARIES( ExoIICTests exoIIv2c-${EXODUSII_VERSION_FULL} ) + + SET( TestsToRun ${ExoIICTests} ) + REMOVE( TestsToRun ExoIICTests.cxx ) +@@ -73,7 +73,7 @@ CONFIGURE_FILE( + + FOREACH ( testName ${cbind_OLDTESTS} ) + ADD_EXECUTABLE( ${testName} ${testName}.c ) +- TARGET_LINK_LIBRARIES( ${testName} exoIIv2c ) ++ TARGET_LINK_LIBRARIES( ${testName} exoIIv2c-${EXODUSII_VERSION_FULL} ) + ENDFOREACH ( testName ) + + #SET( EXECUTABLE_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} ) +Index: exodus-6.02/exodus/forbind/CMakeLists.txt +=================================================================== +--- exodus-6.02.orig/exodus/forbind/CMakeLists.txt ++++ exodus-6.02/exodus/forbind/CMakeLists.txt +@@ -51,16 +51,16 @@ SET(forbind_SRCS + src/exo_jack.c + ) + +-ADD_LIBRARY(exoIIv2for ${EXODUS_LIBRARY_TYPE} ${forbind_SRCS}) ++ADD_LIBRARY(exoIIv2for-${EXODUSII_VERSION_FULL} ${EXODUS_LIBRARY_TYPE} ${forbind_SRCS}) + +-TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY}) ++TARGET_LINK_LIBRARIES(exoIIv2for-${EXODUSII_VERSION_FULL} exoIIv2c-${EXODUSII_VERSION_FULL} ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY}) + + IF(EXODUS_LIBRARY_PROPERTIES) +- SET_TARGET_PROPERTIES(exoIIv2for PROPERTIES ${EXODUS_LIBRARY_PROPERTIES}) ++ SET_TARGET_PROPERTIES(exoIIv2for-${EXODUSII_VERSION_FULL} PROPERTIES ${EXODUS_LIBRARY_PROPERTIES}) + ENDIF(EXODUS_LIBRARY_PROPERTIES) + + IF(NOT EXODUS_INSTALL_NO_LIBRARIES) +- INSTALL(TARGETS exoIIv2for ++ INSTALL(TARGETS exoIIv2for-${EXODUSII_VERSION_FULL} + RUNTIME DESTINATION lib COMPONENT Runtime + LIBRARY DESTINATION lib COMPONENT Runtime + ARCHIVE DESTINATION lib COMPONENT Development) +Index: exodus-6.02/exodus/forbind/test/CMakeLists.txt +=================================================================== +--- exodus-6.02.orig/exodus/forbind/test/CMakeLists.txt ++++ exodus-6.02/exodus/forbind/test/CMakeLists.txt +@@ -30,7 +30,7 @@ SET( forbind_OLDTESTS + + FOREACH ( testName ${forbind_OLDTESTS} ) + ADD_EXECUTABLE( f_${testName} ${testName}.f ) +- TARGET_LINK_LIBRARIES( f_${testName} exoIIv2for ) ++ TARGET_LINK_LIBRARIES( f_${testName} exoIIv2for-${EXODUSII_VERSION_FULL} ) + SET_TARGET_PROPERTIES(f_${testName} PROPERTIES LINKER_LANGUAGE Fortran) + ENDFOREACH ( testName ) + |