Package: aces3 / 3.0.8-7

default_directories.patch Patch series | download
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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
Index: aces3-3.0.8/src/aces/aces_library/a2driver/aces2/mkvmol.F
===================================================================
--- aces3-3.0.8.orig/src/aces/aces_library/a2driver/aces2/mkvmol.F
+++ aces3-3.0.8/src/aces/aces_library/a2driver/aces2/mkvmol.F
@@ -93,7 +93,7 @@ C
       LOGICAL XYZIN,NWFINDIF
       Logical Opn,bad123, GENBAS
 CKJW 5-24-00
-      logical seward,bCpBasis,bExist,bOpened
+      logical seward,bCpBasis,bExist,gExist,bOpened
       Integer OldLu
       Dimension Nord(2*MxAtms),Scratch(NAtms)
 
@@ -200,6 +200,8 @@ C SEE IF A GENBAS FILE IS PRESENT
 C
       INQUIRE(FILE='GENBAS',EXIST=GENBAS)
       IF (.NOT.GENBAS) INQUIRE(FILE='ZMAT.BAS',EXIST=GENBAS)
+      IF (.NOT.GENBAS) INQUIRE(FILE='/usr/share/aces3/GENBAS',
+     &EXIST=GENBAS)
 C
 C     Cautiously open the ZMAT file
 C
@@ -648,7 +650,13 @@ c   o open a basis set file for rdbas an
          rewind(12)
       else
          if (.not.bOpened) then
-            open(unit=12,file='GENBAS',form='formatted',status='old')
+            inquire(file='GENBAS',exist=gExist)
+            if (gExist) then
+              open(unit=12,file='GENBAS',form='formatted',status='old')
+            else
+              open(unit=12,file='/usr/share/aces3/GENBAS',
+     &               form='formatted',status='old')
+            endif
          else
             print *, '@MKVMOL: Assertion failed.'
             print *, '         ZMAT.BAS does not exist but unit 12 is ',
Index: aces3-3.0.8/src/main/write_default_sial_programs.F
===================================================================
--- aces3-3.0.8.orig/src/main/write_default_sial_programs.F
+++ aces3-3.0.8/src/main/write_default_sial_programs.F
@@ -448,6 +448,15 @@ c---------------------------------------
          fn = envvar(1:lenenv) // '/sio/default_jobflows'
          open (unit=iunit, file = fn, status = 'OLD',
      *      err=600, iostat = ios)
+      else
+
+c--------------------------------------------------------------------------
+c   Check for existence of /usr/share/aces3/sio/sial_config
+c--------------------------------------------------------------------------
+
+        fn = '/usr/share/aces3/sio/default_jobflows'
+        open (unit=iunit, file = fn, status = 'OLD',
+     *     err=600, iostat = ios)
       endif
 
   100 continue
Index: aces3-3.0.8/src/main/get_sial_config_params.F
===================================================================
--- aces3-3.0.8.orig/src/main/get_sial_config_params.F
+++ aces3-3.0.8/src/main/get_sial_config_params.F
@@ -128,5 +128,17 @@ c---------------------------------------
       endif 
 
   600 continue
+
+c--------------------------------------------------------------------------
+c   Check for existence of /usr/share/aces3/sio/sial_config
+c--------------------------------------------------------------------------
+
+      config_file = '/usr/share/aces3/sio/sial_config'
+      open (unit=iunit, file = config_file, status = 'OLD',
+     *   err=700, iostat = ios)
+
+      go to 50   ! successfully opened.
+
+  700 continue
       return
       end
Index: aces3-3.0.8/src/sia/sip/aces_instructions/open_aat_database.F
===================================================================
--- aces3-3.0.8.orig/src/sia/sip/aces_instructions/open_aat_database.F
+++ aces3-3.0.8/src/sia/sip/aces_instructions/open_aat_database.F
@@ -72,22 +72,30 @@ c---------------------------------------
 
          ierr_return = 0
          return
+      endif
+
+c----------------------------------------------------------------------------
+c   Next, try to open the copy in the default directory.
+c----------------------------------------------------------------------------
+       
+  300 continue
+      fn = '/usr/share/aces3/' // '/sio/' // aat_database(1:n)
+      open (unit=iunit, file = fn, status = 'OLD',
+     *   err=400, iostat = ierr)
 
 c---------------------------------------------------------------------------
-c   The open failed.  Return an error.
+c   Successful open.
 c---------------------------------------------------------------------------
 
-  300    continue
-         ierr_return = ierr
-      else
+      ierr_return = 0
+      return
 
 c---------------------------------------------------------------------------
-c   The first attempt failed, and there is no env. variable coded.  
-c   Return an error code. 
+c   The open failed.  Return an error.
 c---------------------------------------------------------------------------
 
-         ierr_return = ierr
-      endif
+  400 continue
+      ierr_return = ierr
 
       return
       end
Index: aces3-3.0.8/src/sia/sip_shared/sial_interface.F
===================================================================
--- aces3-3.0.8.orig/src/sia/sip_shared/sial_interface.F
+++ aces3-3.0.8/src/sia/sip_shared/sial_interface.F
@@ -423,13 +423,17 @@ c---------------------------------------
          call c_getenv('ACES_EXE_PATH'//char(0),
      *            aces_exe_path, lenval,ierr)
          if (ierr .ne. 0) then
-            print *,'Error attempting to read ACES_EXE_PATH ',
-     *               'env. variable, ierr = ',ierr
-            call c_exit(1)
-         endif
-        
-         siofile = aces_exe_path(1:lenval) // '/sio/' // 
+
+c--------------------------------------------------------------------------
+c   Check for the existence of the file in the default directory.
+c--------------------------------------------------------------------------
+
+            siofile = '/usr/share/aces3/sio/' // 
      *             obj_filename(1:n)
+         else
+            siofile = aces_exe_path(1:lenval) // '/sio/' // 
+     *             obj_filename(1:n)
+         endif
       endif
 c--------------------------------------------------------------------------
 c   Open the output file name and read the file header.