1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
--- ./src/sia/sip/sip_instructions/blkmgr.F.orig 2014-10-13 16:22:28.376742952 +0200
+++ ./src/sia/sip/sip_instructions/blkmgr.F 2014-10-13 16:22:31.860679813 +0200
@@ -3907,9 +3907,9 @@
call get_blk_header(next, ptr, c_persistent_ptr)
call get_blk_header(stack, i,c_block_stack)
- call get_blk_header(flag, i,c_block_flags)
- persistent = and(flag, block_persistence_flag)
- if (persistent .eq. 0) then
+ call get_blk_header(flagval, i,c_block_flags)
+ persistent = and(flagval, block_persistence_flag)
+ if (persistent) then
if (n_tot .lt. stack_size(mystack)) then
ptr = ptr - 1
go to 100
--- ./src/aces/aces_library/a2driver/geopt/tkstep.F.orig 2014-10-13 16:39:25.894291904 +0200
+++ ./src/aces/aces_library/a2driver/geopt/tkstep.F 2014-10-13 16:42:01.663465582 +0200
@@ -14,7 +14,7 @@
C
DOUBLE PRECISION LMBDAN, LMBDAP
LOGICAL MORSE, TS, NRORMANR, RFA, EVFTS, IGTS, QSD,
- & QSTLST_CLIMB
+ & QSTLST_CLIMB, NOT_FOUND
C
#include "mxatms.par"
#include "machsp.com"
--- ./src/sia/sip/aces_instructions/compute_block.F.orig 2014-10-13 16:49:44.167071463 +0200
+++ ./src/sia/sip/aces_instructions/compute_block.F 2014-10-13 16:50:13.142545468 +0200
@@ -370,7 +370,7 @@
if (op(c_ind1+k-1) .eq. wildcard_indicator)
* partial_create = .true.
enddo
- if (partial_create .eq. .false.) then
+ if (partial_create .eqv. .false.) then
print *,'Task ',me,' Error: Attempt to create an array ',
* 'that has already been created.', partial_create
print *,'Wild Array = ', (op(c_ind1+k-1), k=1, nindex)
--- ./src/main/find_jobflow.F.orig 2014-10-13 17:12:53.417839731 +0200
+++ ./src/main/find_jobflow.F 2014-10-13 17:13:06.409603665 +0200
@@ -411,7 +411,7 @@
& dea_singlet_root .gt. 0) jobflow = 'EOMDEA_CCSD_SINGLET'
if (ref .eq. 1 .and. Calc .eq. 10 .and. dea_calc .eq. 2 .and.
- & dea_triplet_root) jobflow = 'EOMDEA_CCSD_TRIPLET'
+ & dea_triplet_root .gt. 0) jobflow = 'EOMDEA_CCSD_TRIPLET'
return
end
--- ./src/main/write_default_sial_programs.F.orig 2014-10-13 17:14:08.772470480 +0200
+++ ./src/main/write_default_sial_programs.F 2014-10-13 17:14:33.184026891 +0200
@@ -407,7 +407,7 @@
& dea_singlet_root .gt. 0) jobflow = 'EOMDEA_CCSD_SINGLET'
if (ref .eq. 1 .and. Calc .eq. 10 .and. dea_calc .eq. 2 .and.
- & dea_triplet_root) jobflow = 'EOMDEA_CCSD_TRIPLET'
+ & dea_triplet_root .gt. 0) jobflow = 'EOMDEA_CCSD_TRIPLET'
n = str_trimlen(jobflow)
print *,'Using Default jobflow = ',jobflow(1:n)
|
