From a32e1a0cd4f845f21c7ff376ac65d2a6c9f7a58b Mon Sep 17 00:00:00 2001
From: Wiarda <wiardada@ornl.gov>
Date: Wed, 3 Jun 2020 09:53:06 -0400
Subject: [PATCH] WIP: more chasing
---
sammy/samtry/CMakeLists.txt | 239 ++++++++++++++++++++++++++++++------
sammy/src/npv/mnpv7.f | 9 +-
sammy/src/npv/mnpv9.f | 6 +-
3 files changed, 209 insertions(+), 45 deletions(-)
diff --git a/sammy/samtry/CMakeLists.txt b/sammy/samtry/CMakeLists.txt
index 1f296388f..91d1cc6ed 100755
--- a/sammy/samtry/CMakeLists.txt
+++ b/sammy/samtry/CMakeLists.txt
@@ -2,34 +2,197 @@ INCLUDE(SammyPackageSetup)
TRIBITS_PACKAGE(samtry)
-
-#FILE(GLOB SAMTRY tr* )
+# test are sorted by longest running first to help the CI to start it in this order
SET(SAMTRY
- tr003
- tr028
- tr039
- tr049
- tr057
- tr066
- tr082
- tr083
- tr084
- tr085
- tr105
- tr109
- tr112
- tr126
- tr130
- tr139
- tr146
- tr154
- tr161
- tr167
- tr169
- tr172
- tr174
- tr176
- tr189
+ 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
)
foreach(INPUT ${SAMTRY})
@@ -43,17 +206,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/mnpv7.f b/sammy/src/npv/mnpv7.f
index fd7709378..7e3457611 100644
--- a/sammy/src/npv/mnpv7.f
+++ b/sammy/src/npv/mnpv7.f
@@ -81,20 +81,17 @@ C
C
C --------------------------------------------------------------
C
- SUBROUTINE Reorg (Th, Gx, Wth, Wgxa, Wgxb, Kdat)
+ SUBROUTINE Reorg (Gx, Wgxa, Wgxb, Kdat)
C
C *** Purpose == Reorganize storage
C
use fixedi_m
use ifwrit_m
IMPLICIT DOUBLE PRECISION (a-h,o-z)
- DIMENSION Th(*), Gx(Numcro,Napthe,*),
- * Wth(*), Wgxa(Numcro,Ndaxxx,*), Wgxb(Numcro,Ndbxxx,*)
+ DIMENSION Gx(Numcro,Napthe,*),
+ * Wgxa(Numcro,Ndaxxx,*), Wgxb(Numcro,Ndbxxx,*)
C
N = Kdat*Numcro
- DO I=1,N
- Th(I) = Wth(I)
- END DO
IF (Ndasig.GT.0) THEN
DO I=1,Kdat
DO K=1,Ndasig
diff --git a/sammy/src/npv/mnpv9.f b/sammy/src/npv/mnpv9.f
index 579731ddd..4ed1bb98d 100644
--- a/sammy/src/npv/mnpv9.f
+++ b/sammy/src/npv/mnpv9.f
@@ -66,7 +66,11 @@ C
C *** Copy Wsigxx into Th and Wd?sig into Gx
C A(Iwsigx) -> A(Ith)
C ( A(Iwdasi), A_Iwdbsi ) -> A_Igx
- CALL Reorg (A(Ith), A_Igx, A(Iwsigx), A(Iwdasi), A_Iwdbsi , Kdat)
+ N = Kdat*Numcro
+ DO I=1,N
+ A(Ith + I -1) = A(Iwsigx + I -1)
+ END DO
+ CALL Reorg ( A_Igx, A(Iwdasi), A_Iwdbsi , Kdat)
C
C
IF (Ksolve.NE.2 .OR. Nfpall.GT.Nvpall) THEN
--
GitLab