From 1678c6a594ae260b309e788a663952d9a6323221 Mon Sep 17 00:00:00 2001 From: Wiarda <wiardada@ornl.gov> Date: Wed, 3 Jun 2020 11:06:25 -0400 Subject: [PATCH] WIP: Add tests back --- sammy/samtry/CMakeLists.txt | 396 ++++++++++++++++++------------------ sammy/src/npv/mnpv9.f | 1 + 2 files changed, 198 insertions(+), 199 deletions(-) diff --git a/sammy/samtry/CMakeLists.txt b/sammy/samtry/CMakeLists.txt index 91d1cc6ed..78896e002 100755 --- a/sammy/samtry/CMakeLists.txt +++ b/sammy/samtry/CMakeLists.txt @@ -4,195 +4,193 @@ TRIBITS_PACKAGE(samtry) # test are sorted by longest running first to help the CI to start it in this order SET(SAMTRY + tr114 + tr182 + tr161 + tr126 + tr071 + tr039 + tr051 + tr174 + tr156 + tr119 + tr183 + tr054 + tr085 + tr131 + tr066 + tr073 + tr171 + tr166 + tr135 + tr160 + tr082 + tr186 + tr069 + tr137 + tr094 + tr060 + tr019 + tr086 + tr096 + tr070 + tr157 + tr130 + tr083 + tr042 + tr088 + tr017 + tr104 + tr118 + tr152 + tr057 + tr155 + tr087 + tr149 + tr140 + tr091 + tr064 + tr100 + tr112 + tr124 + tr089 + tr098 + tr115 + tr167 + tr090 + tr154 + tr062 + tr145 + tr136 + tr125 + tr052 + tr175 + tr146 + tr078 + tr076 + tr026 + tr049 + tr040 + tr095 + tr113 + tr010 + tr153 + tr144 tr128 - -# tr114 -# tr182 -# tr161 -# tr126 -# tr071 -# tr039 -# tr051 -# tr174 -# tr156 -# tr119 -# tr183 -# tr054 -# tr085 -# tr131 -# tr066 -# tr073 -# tr171 -# tr166 -# tr135 -# tr160 -# tr082 -# tr186 -# tr069 -# tr137 -# tr094 -# tr060 -# tr019 -# tr086 -# tr096 -# tr070 -# tr157 -# tr130 -# tr083 -# tr042 -# tr088 -# tr017 -# tr104 -# tr118 -# tr152 -# tr057 -# tr155 -# tr087 -# tr149 -# tr140 -# tr091 -# tr064 -# tr100 -# tr112 -# tr124 -# tr089 -# tr098 -# tr115 -# tr167 -# tr090 -# tr154 -# tr062 -# tr145 -# tr136 -# tr125 -# tr052 -# tr175 -# tr146 -# tr078 -# tr076 -# tr026 -# tr049 -# tr040 -# tr095 -# tr113 -# tr010 -# tr153 -# tr144 -# tr128 -# tr188 -# tr005 -# tr177 -# tr084 -# tr077 -# tr165 -# tr105 -# tr142 -# tr185 -# tr079 -# tr107 -# tr170 -# tr116 -# tr080 -# tr037 -# tr001 -# tr074 -# tr033 -# tr025 -# tr147 -# tr102 -# tr029 -# tr132 -# tr046 -# tr172 -# tr038 -# tr056 -# tr004 -# tr011 -# tr099 -# tr129 -# tr048 -# tr044 -# tr016 -# tr143 -# tr103 -# tr123 -# tr068 -# tr169 -# tr117 -# tr173 -# tr108 -# tr159 -# tr041 -# tr058 -# tr020 -# tr163 -# tr021 -# tr181 -# tr032 -# tr009 -# tr031 -# tr002 -# tr034 -# tr047 -# tr036 -# tr014 -# tr179 -# tr053 -# tr007 -# tr003 -# tr035 -# tr018 -# tr180 -# tr138 -# tr059 -# tr111 -# tr189 -# tr134 -# tr148 -# tr093 -# tr024 -# tr043 -# tr097 -# tr168 -# tr008 -# tr151 -# tr055 -# tr006 -# tr022 -# tr122 -# tr121 -# tr013 -# tr081 -# tr045 -# tr028 -# tr101 -# tr012 -# tr133 -# tr015 -# tr176 -# tr109 -# tr030 -# tr050 -# tr150 -# tr184 -# tr075 -# tr061 -# tr164 -# tr178 -# tr162 -# tr106 -# tr127 -# tr110 -# tr027 -# tr023 -# tr092 -# tr063 -# tr139 -# tr067 -# tr141 -# tr158 -# tr187 -# tr072 + tr188 + tr005 + tr177 + tr084 + tr077 + tr165 + tr105 + tr142 + tr185 + tr079 + tr107 + tr170 + tr116 + tr080 + tr037 + tr001 + tr074 + tr033 + tr025 + tr147 + tr102 + tr029 + tr132 + tr046 + tr172 + tr038 + tr056 + tr004 + tr011 + tr099 + tr129 + tr048 + tr044 + tr016 + tr143 + tr103 + tr123 + tr068 + tr169 + tr117 + tr173 + tr108 + tr159 + tr041 + tr058 + tr020 + tr163 + tr021 + tr181 + tr032 + tr009 + tr031 + tr002 + tr034 + tr047 + tr036 + tr014 + tr179 + tr053 + tr007 + tr003 + tr035 + tr018 + tr180 + tr138 + tr059 + tr111 + tr189 + tr134 + tr148 + tr093 + tr024 + tr043 + tr097 + tr168 + tr008 + tr151 + tr055 + tr006 + tr022 + tr122 + tr121 + tr013 + tr081 + tr045 + tr028 + tr101 + tr012 + tr133 + tr015 + tr176 + tr109 + tr030 + tr050 + tr150 + tr184 + tr075 + tr061 + tr164 + tr178 + tr162 + tr106 + tr127 + tr110 + tr027 + tr023 + tr092 + tr063 + tr139 + tr067 + tr141 + tr158 + tr187 + tr072 ) foreach(INPUT ${SAMTRY}) @@ -206,17 +204,17 @@ foreach(INPUT ${SAMTRY}) ENDFOREACH() -#set_tests_properties(tr083 PROPERTIES DEPENDS "tr082") -#set_tests_properties(tr084 PROPERTIES DEPENDS "tr082;tr083") -#set_tests_properties(tr085 PROPERTIES DEPENDS "tr082") -#set_tests_properties(tr126 PROPERTIES DEPENDS "tr082") -#set_tests_properties(tr146 PROPERTIES DEPENDS "tr082") -#set_tests_properties(tr130 PROPERTIES DEPENDS "tr126;tr082") -#set_tests_properties(tr154 PROPERTIES DEPENDS "tr126") -#set_tests_properties(tr161 PROPERTIES DEPENDS "tr126;tr082") -#set_tests_properties(tr167 PROPERTIES DEPENDS "tr126;tr082") -#set_tests_properties(tr174 PROPERTIES DEPENDS "tr161;tr167;tr126;tr082") -#set_tests_properties(tr169 PROPERTIES DEPENDS "tr082;tr126;tr082") +set_tests_properties(tr083 PROPERTIES DEPENDS "tr082") +set_tests_properties(tr084 PROPERTIES DEPENDS "tr082;tr083") +set_tests_properties(tr085 PROPERTIES DEPENDS "tr082") +set_tests_properties(tr126 PROPERTIES DEPENDS "tr082") +set_tests_properties(tr146 PROPERTIES DEPENDS "tr082") +set_tests_properties(tr130 PROPERTIES DEPENDS "tr126;tr082") +set_tests_properties(tr154 PROPERTIES DEPENDS "tr126") +set_tests_properties(tr161 PROPERTIES DEPENDS "tr126;tr082") +set_tests_properties(tr167 PROPERTIES DEPENDS "tr126;tr082") +set_tests_properties(tr174 PROPERTIES DEPENDS "tr161;tr167;tr126;tr082") +set_tests_properties(tr169 PROPERTIES DEPENDS "tr082;tr126;tr082") TRIBITS_PACKAGE_POSTPROCESS() diff --git a/sammy/src/npv/mnpv9.f b/sammy/src/npv/mnpv9.f index 4ed1bb98d..c48ae2350 100644 --- a/sammy/src/npv/mnpv9.f +++ b/sammy/src/npv/mnpv9.f @@ -67,6 +67,7 @@ C *** Copy Wsigxx into Th and Wd?sig into Gx C A(Iwsigx) -> A(Ith) C ( A(Iwdasi), A_Iwdbsi ) -> A_Igx N = Kdat*Numcro + write(0,*)" ?? ",Ith,Iwsigx,"-",N DO I=1,N A(Ith + I -1) = A(Iwsigx + I -1) END DO -- GitLab