summarylogtreecommitdiffstats
path: root/globals_apbs.patch
blob: b5756c7747a282ecfdbb87b98d7d6ebbbb22e9e7 (plain)
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
--- src/pmgc/mgsubd.c	2020-05-30 04:47:30.000000000 +0300
+++ src/pmgc/mgsubd.c	2020-08-19 13:08:27.503698756 +0300
@@ -52,10 +52,12 @@
  * @endverbatim
  */
 
 #include "mgsubd.h"
 
+double bf, oh, cputme;
+
 VPUBLIC void Vbuildops(
         int *nx, int *ny, int *nz,
         int *nlev, int *ipkey, int *iinfo,
         int *ido, int *iz,
         int *mgprol, int *mgcoar, int *mgsolv, int *mgdisc, int *ipc,
--- src/pmgc/mgsubd.h	2020-05-30 04:47:30.000000000 +0300
+++ src/pmgc/mgsubd.h	2020-08-19 13:08:54.266813098 +0300
@@ -253,11 +253,11 @@
         int n3  ///< The third grid size
         );
 
 
 /// @todo  Get rid of these globals in refactor
-double bf, oh, cputme;
+extern double bf, oh, cputme;
 
 /** @brief   This routine prints out some info and such from inside multigrid.
  *  @author  Tucker Beck [C Translation], Michael Holst [Original]
  *  @note    Replaces prtstp from mgsubd.f
  */
--- src/pmgc/mypdec.c	2020-05-30 04:47:30.000000000 +0300
+++ src/pmgc/mypdec.c	2020-08-19 13:09:34.939813105 +0300
@@ -52,10 +52,15 @@
  * @endverbatim
  */
 
 #include "mypdec.h"
 
+double v1, v2, v3, conc1, conc2, conc3, vol, relSize;
+int nion;
+double charge[MAXIONS];
+double sconc[MAXIONS];
+
 VPUBLIC void Vmypdefinitlpbe(int *tnion, double *tcharge, double *tsconc) {
 
     int i;
 
     nion = *tnion;
--- src/pmgc/mypdec.h	2020-05-30 04:47:30.000000000 +0300
+++ src/pmgc/mypdec.h	2020-08-19 13:09:56.172972195 +0300
@@ -65,14 +65,14 @@
 #define ZLARGE     1.0e20
 #define SINH_MIN -85.0
 #define SINH_MAX  85.0
 
 /// @todo  Remove dependencies on global variables
-double v1, v2, v3, conc1, conc2, conc3, vol, relSize;
-int nion;
-double charge[MAXIONS];
-double sconc[MAXIONS];
+extern double v1, v2, v3, conc1, conc2, conc3, vol, relSize;
+extern int nion;
+extern double charge[MAXIONS];
+extern double sconc[MAXIONS];
 
 #define Na 6.022045000e-04
 
 /** @brief   Set up the ionic species to be used in later calculations.  This
  *           must be called before any other of the routines in this file.