Merge pull request #29 from drewnutt/master

fix mdpocket to allow for reading in list of pdb files

.gitignore

@@ -1,3 +1,5 @@
 nbproject
 *.o
 *_out
+.vscode
+src/qhull/bin/

INSTALL.txt

@@ -1,22 +1,4 @@
-// Fpocket brought to you by Vincent Le Guilloux & Peter Schmidtke
-//
-// GNU GPL
-// 
-// This file is part of the fpocket package.
-// 
-// fpocket is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// fpocket is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with fpocket. If not, see <http://www.gnu.org/licenses/>.
-// 
+
 ===========================
 DEPENDENCIES              :
 ===========================

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Peter Schmidtke & Vincent Le Guilloux
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -41,14 +41,27 @@ sudo yum install netcdf-devel.x86_64
 
 Download the sources from github via the website or using git clone and then build and deploy fpocket using the following commands.
 
+#### Compiling on Linux
 
 ```
-git clone https://github.com/Discngine/fpocket.git .
+git clone https://github.com/Discngine/fpocket.git
 cd fpocket
 make 
 sudo make install
 ```
 
+#### Compiling on Mac
+Install MacPorts https://www.macports.org/ for instance (needed for netcdf install)
+```
+sudo port install netcdf
+export LIBRARY_PATH=/opt/local/lib
+git clone https://github.com/Discngine/fpocket.git
+cd fpocket
+make ARCH=MACOSXX86_64
+sudo make install
+```
+
+
 
 End with an example of getting some data out of the system or using it for a little demo
 
@@ -66,6 +79,50 @@ fpocket should state when it's beginning to search pocket and also when it's end
 ## User Manual
 For now the user manual (still the one from fpocket 2.0) can be found in the doc folder. When I have some time to kill (or if somebody else has) we could add that here somewhere.
 
+## Frequent issues encountered
+### netcdf issues
+```
+cannot find -lnetcdf
+```
+mdpocket supports reading and writing NETCDF formatted files. In order to use this you need to install the netcdf development libraries on your system. 
+In centos this can be achieved like this : 
+```
+yum install -y epel-release #if the epel repo is not yet activated on your system
+yum install -y netcdf-devel
+
+```
+
+Run make again after installing this library. Mdpocket should build just fine now. 
+
+### stdc++ issues
+```
+cannot find -lstdc++
+```
+You need to install the stc++ static libraries to build fpocket & mdpocket. On centos 7.4 this can be done like this : 
+```
+yum install -y libstc++-static
+```
+
+### linking to molfile plugin issues
+If you observe an error similar to this one
+```
+ld: warning: ignoring file plugins/MACOSXX86/molfile/libmolfile_plugin.a, file was built for archive which is not the architecture being linked (x86_64): plugins/MACOSXX86/molfile/libmolfile_plugin.a
+Undefined symbols for architecture x86_64:
+  "_molfile_parm7plugin_init", referenced from:
+      _read_topology in topology.o
+  "_molfile_parm7plugin_register", referenced from:
+      _read_topology in topology.o
+ld: symbol(s) not found for architecture x86_64
+clang: error: linker command failed with exit code 1 (use -v to see invocation)
+make[1]: *** [bin/fpocket] Error 1
+make: *** [all] Error 2
+```
+then statically built libmolfile_plugin is not compatible with your machine. First check out that the ARCH variable set in the first line of the Makefile of fpocket actually reflects the architecture you want. For now I'm trying to support linux 64 bit systems and OSX 64 (LINUXAMD64) bit systems built with clang (MACOSXX86). So both should work out of the box. If they do not, you might need to build the molfile plugin for your architecture. All available system architectures for the molfile plugin can be found in the plugins folder tree : [plugins directory](https://github.com/Discngine/fpocket/tree/master/plugins). 
+Here you can find more information on how to build the molfile plugin on CentOS 7.4: 
+[compile molfile plugin on centos 7.4 - Discngine blog post](https://www.discngine.com/blog/2019/5/25/building-the-vmd-molfile-plugin-from-source-code)
+Once built, copy the architecture folder into the fpocket/plugins directory and make sure to declare this architecture in the ARCH variable in the Makefile. Finally run make again.
+If you manage to build for other architectures and it works, I'd be happy to accept PR's with the relevant plugin architectures as I cannot build all of them on my own ;).
+
 ## Contributing
 
 Please read [CONTRIBUTING.md](https://gist.github.com/PurpleBooth/b24679402957c63ec426) for details on our code of conduct, and the process for submitting pull requests to us.
@@ -79,7 +136,7 @@ Please read [CONTRIBUTING.md](https://gist.github.com/PurpleBooth/b24679402957c6
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
 
 ## Acknowledgments
 

data/sample/mdpocket/input.txt

@@ -0,0 +1,10 @@
+2yex.pdb
+3ot3.pdb
+3pa3.pdb
+3pa4.pdb
+3tki.pdb
+4hyi.pdb
+4rvk.pdb
+5opb.pdb
+5opu.pdb
+5oq5.pdb

data/sample/mdpocket/mdpout_dens_iso_8.pdb

@@ -0,0 +1,184 @@
+ATOM      1  C   PTH     1      -8.641   4.782   5.052  0.00  0.00
+ATOM      2  C   PTH     1      -8.641   4.782   6.052  0.00  0.00
+ATOM      3  C   PTH     1      -8.641   5.782   6.052  0.00  0.00
+ATOM      4  C   PTH     1      -7.641   4.782   5.052  0.00  0.00
+ATOM      5  C   PTH     1      -7.641   4.782   6.052  0.00  0.00
+ATOM      6  C   PTH     1      -7.641   5.782   3.052  0.00  0.00
+ATOM      7  C   PTH     1      -7.641   5.782   4.052  0.00  0.00
+ATOM      8  C   PTH     1      -7.641   5.782   6.052  0.00  0.00
+ATOM      9  C   PTH     1      -7.641   6.782   7.052  0.00  0.00
+ATOM     10  C   PTH     1      -6.641   4.782   3.052  0.00  0.00
+ATOM     11  C   PTH     1      -6.641   4.782   4.052  0.00  0.00
+ATOM     12  C   PTH     1      -6.641   5.782   3.052  0.00  0.00
+ATOM     13  C   PTH     1      -6.641   5.782   4.052  0.00  0.00
+ATOM     14  C   PTH     1      -6.641   5.782   5.052  0.00  0.00
+ATOM     15  C   PTH     1      -6.641   5.782   6.052  0.00  0.00
+ATOM     16  C   PTH     1      -6.641   5.782   7.052  0.00  0.00
+ATOM     17  C   PTH     1      -6.641   6.782   3.052  0.00  0.00
+ATOM     18  C   PTH     1      -6.641   6.782   4.052  0.00  0.00
+ATOM     19  C   PTH     1      -6.641   6.782   7.052  0.00  0.00
+ATOM     20  C   PTH     1      -6.641  20.782  12.052  0.00  0.00
+ATOM     21  C   PTH     1      -5.641   4.782   4.052  0.00  0.00
+ATOM     22  C   PTH     1      -5.641   5.782   3.052  0.00  0.00
+ATOM     23  C   PTH     1      -5.641   5.782   4.052  0.00  0.00
+ATOM     24  C   PTH     1      -5.641   5.782   5.052  0.00  0.00
+ATOM     25  C   PTH     1      -5.641   6.782   4.052  0.00  0.00
+ATOM     26  C   PTH     1      -5.641   6.782   5.052  0.00  0.00
+ATOM     27  C   PTH     1      -4.641   5.782   4.052  0.00  0.00
+ATOM     28  C   PTH     1      -4.641   5.782   5.052  0.00  0.00
+ATOM     29  C   PTH     1      -4.641   6.782   4.052  0.00  0.00
+ATOM     30  C   PTH     1      -2.641  12.782 -14.948  0.00  0.00
+ATOM     31  C   PTH     1      -2.641  13.782 -14.948  0.00  0.00
+ATOM     32  C   PTH     1      -2.641  13.782 -13.948  0.00  0.00
+ATOM     33  C   PTH     1      -1.641  12.782 -14.948  0.00  0.00
+ATOM     34  C   PTH     1      -1.641  13.782 -15.948  0.00  0.00
+ATOM     35  C   PTH     1      -1.641  13.782 -14.948  0.00  0.00
+ATOM     36  C   PTH     1      -0.641  11.782 -15.948  0.00  0.00
+ATOM     37  C   PTH     1      -0.641  12.782 -15.948  0.00  0.00
+ATOM     38  C   PTH     1       0.359  11.782 -15.948  0.00  0.00
+ATOM     39  C   PTH     1       1.359   7.782  18.052  0.00  0.00
+ATOM     40  C   PTH     1       1.359   7.782  19.052  0.00  0.00
+ATOM     41  C   PTH     1       1.359   8.782  19.052  0.00  0.00
+ATOM     42  C   PTH     1       1.359   8.782  20.052  0.00  0.00
+ATOM     43  C   PTH     1       1.359  26.782  -9.948  0.00  0.00
+ATOM     44  C   PTH     1       2.359   6.782  18.052  0.00  0.00
+ATOM     45  C   PTH     1       2.359   7.782  18.052  0.00  0.00
+ATOM     46  C   PTH     1       2.359   7.782  19.052  0.00  0.00
+ATOM     47  C   PTH     1       2.359   8.782  19.052  0.00  0.00
+ATOM     48  C   PTH     1       2.359   8.782  20.052  0.00  0.00
+ATOM     49  C   PTH     1       3.359   4.782  17.052  0.00  0.00
+ATOM     50  C   PTH     1       3.359   5.782  17.052  0.00  0.00
+ATOM     51  C   PTH     1       3.359   5.782  18.052  0.00  0.00
+ATOM     52  C   PTH     1       3.359   6.782  17.052  0.00  0.00
+ATOM     53  C   PTH     1       3.359   6.782  18.052  0.00  0.00
+ATOM     54  C   PTH     1       3.359   8.782  19.052  0.00  0.00
+ATOM     55  C   PTH     1       3.359   8.782  20.052  0.00  0.00
+ATOM     56  C   PTH     1       3.359   9.782  20.052  0.00  0.00
+ATOM     57  C   PTH     1       3.359  19.782 -13.948  0.00  0.00
+ATOM     58  C   PTH     1       3.359  19.782 -12.948  0.00  0.00
+ATOM     59  C   PTH     1       3.359  20.782 -12.948  0.00  0.00
+ATOM     60  C   PTH     1       3.359  21.782 -12.948  0.00  0.00
+ATOM     61  C   PTH     1       3.359  21.782 -11.948  0.00  0.00
+ATOM     62  C   PTH     1       4.359   4.782  16.052  0.00  0.00
+ATOM     63  C   PTH     1       4.359   4.782  17.052  0.00  0.00
+ATOM     64  C   PTH     1       4.359   5.782  15.052  0.00  0.00
+ATOM     65  C   PTH     1       4.359   5.782  16.052  0.00  0.00
+ATOM     66  C   PTH     1       4.359   5.782  17.052  0.00  0.00
+ATOM     67  C   PTH     1       4.359   5.782  18.052  0.00  0.00
+ATOM     68  C   PTH     1       4.359   6.782  16.052  0.00  0.00
+ATOM     69  C   PTH     1       4.359   6.782  17.052  0.00  0.00
+ATOM     70  C   PTH     1       4.359   8.782  19.052  0.00  0.00
+ATOM     71  C   PTH     1       4.359   8.782  20.052  0.00  0.00
+ATOM     72  C   PTH     1       4.359   9.782  19.052  0.00  0.00
+ATOM     73  C   PTH     1       4.359   9.782  20.052  0.00  0.00
+ATOM     74  C   PTH     1       4.359  20.782 -12.948  0.00  0.00
+ATOM     75  C   PTH     1       4.359  21.782 -12.948  0.00  0.00
+ATOM     76  C   PTH     1       5.359   4.782  15.052  0.00  0.00
+ATOM     77  C   PTH     1       5.359   5.782  15.052  0.00  0.00
+ATOM     78  C   PTH     1       5.359   5.782  16.052  0.00  0.00
+ATOM     79  C   PTH     1       6.359   5.782  -0.948  0.00  0.00
+ATOM     80  C   PTH     1       6.359   5.782   0.052  0.00  0.00
+ATOM     81  C   PTH     1       6.359   5.782   1.052  0.00  0.00
+ATOM     82  C   PTH     1       6.359   6.782   0.052  0.00  0.00
+ATOM     83  C   PTH     1       6.359   6.782   1.052  0.00  0.00
+ATOM     84  C   PTH     1       6.359   7.782   0.052  0.00  0.00
+ATOM     85  C   PTH     1       6.359   7.782   1.052  0.00  0.00
+ATOM     86  C   PTH     1       7.359  -0.218  -1.948  0.00  0.00
+ATOM     87  C   PTH     1       7.359   0.782  -1.948  0.00  0.00
+ATOM     88  C   PTH     1       7.359   5.782  -0.948  0.00  0.00
+ATOM     89  C   PTH     1       7.359   5.782   0.052  0.00  0.00
+ATOM     90  C   PTH     1       7.359   5.782   1.052  0.00  0.00
+ATOM     91  C   PTH     1       7.359   6.782  -0.948  0.00  0.00
+ATOM     92  C   PTH     1       7.359   6.782   0.052  0.00  0.00
+ATOM     93  C   PTH     1       7.359   6.782   1.052  0.00  0.00
+ATOM     94  C   PTH     1       7.359   6.782  16.052  0.00  0.00
+ATOM     95  C   PTH     1       7.359   7.782  -0.948  0.00  0.00
+ATOM     96  C   PTH     1       7.359   7.782   0.052  0.00  0.00
+ATOM     97  C   PTH     1       7.359   7.782  16.052  0.00  0.00
+ATOM     98  C   PTH     1       7.359   7.782  17.052  0.00  0.00
+ATOM     99  C   PTH     1       7.359   8.782  17.052  0.00  0.00
+ATOM    100  C   PTH     1       7.359   8.782  18.052  0.00  0.00
+ATOM    101  C   PTH     1       7.359   9.782  18.052  0.00  0.00
+ATOM    102  C   PTH     1       7.359   9.782  19.052  0.00  0.00
+ATOM    103  C   PTH     1       8.359  -1.218  -2.948  0.00  0.00
+ATOM    104  C   PTH     1       8.359  -1.218  -1.948  0.00  0.00
+ATOM    105  C   PTH     1       8.359  -1.218  -0.948  0.00  0.00
+ATOM    106  C   PTH     1       8.359  -0.218  -2.948  0.00  0.00
+ATOM    107  C   PTH     1       8.359  -0.218  -1.948  0.00  0.00
+ATOM    108  C   PTH     1       8.359  -0.218  -0.948  0.00  0.00
+ATOM    109  C   PTH     1       8.359   0.782  -2.948  0.00  0.00
+ATOM    110  C   PTH     1       8.359   0.782  -1.948  0.00  0.00
+ATOM    111  C   PTH     1       8.359   4.782  15.052  0.00  0.00
+ATOM    112  C   PTH     1       8.359   5.782  16.052  0.00  0.00
+ATOM    113  C   PTH     1       8.359   6.782  -0.948  0.00  0.00
+ATOM    114  C   PTH     1       8.359   6.782  16.052  0.00  0.00
+ATOM    115  C   PTH     1       8.359   6.782  17.052  0.00  0.00
+ATOM    116  C   PTH     1       8.359   7.782  -0.948  0.00  0.00
+ATOM    117  C   PTH     1       8.359   7.782  16.052  0.00  0.00
+ATOM    118  C   PTH     1       8.359   7.782  17.052  0.00  0.00
+ATOM    119  C   PTH     1       8.359   8.782  -0.948  0.00  0.00
+ATOM    120  C   PTH     1       8.359   8.782  18.052  0.00  0.00
+ATOM    121  C   PTH     1       8.359   9.782  17.052  0.00  0.00
+ATOM    122  C   PTH     1       8.359   9.782  18.052  0.00  0.00
+ATOM    123  C   PTH     1       9.359  -2.218  -1.948  0.00  0.00
+ATOM    124  C   PTH     1       9.359  -1.218  -2.948  0.00  0.00
+ATOM    125  C   PTH     1       9.359  -1.218  -1.948  0.00  0.00
+ATOM    126  C   PTH     1       9.359  -1.218  -0.948  0.00  0.00
+ATOM    127  C   PTH     1       9.359  -0.218  -2.948  0.00  0.00
+ATOM    128  C   PTH     1       9.359  -0.218  -1.948  0.00  0.00
+ATOM    129  C   PTH     1       9.359   0.782  -2.948  0.00  0.00
+ATOM    130  C   PTH     1       9.359   5.782  15.052  0.00  0.00
+ATOM    131  C   PTH     1       9.359   6.782  16.052  0.00  0.00
+ATOM    132  C   PTH     1       9.359   7.782 -14.948  0.00  0.00
+ATOM    133  C   PTH     1       9.359  17.782  -6.948  0.00  0.00
+ATOM    134  C   PTH     1       9.359  18.782  -6.948  0.00  0.00
+ATOM    135  C   PTH     1       9.359  24.782  -0.948  0.00  0.00
+ATOM    136  C   PTH     1      10.359   6.782  16.052  0.00  0.00
+ATOM    137  C   PTH     1      10.359   7.782  16.052  0.00  0.00
+ATOM    138  C   PTH     1      10.359  10.782  15.052  0.00  0.00
+ATOM    139  C   PTH     1      10.359  17.782  -6.948  0.00  0.00
+ATOM    140  C   PTH     1      10.359  17.782  -5.948  0.00  0.00
+ATOM    141  C   PTH     1      10.359  18.782  -6.948  0.00  0.00
+ATOM    142  C   PTH     1      10.359  18.782  -5.948  0.00  0.00
+ATOM    143  C   PTH     1      10.359  18.782  -4.948  0.00  0.00
+ATOM    144  C   PTH     1      10.359  18.782  -3.948  0.00  0.00
+ATOM    145  C   PTH     1      10.359  19.782  -3.948  0.00  0.00
+ATOM    146  C   PTH     1      10.359  24.782  -0.948  0.00  0.00
+ATOM    147  C   PTH     1      10.359  25.782  -0.948  0.00  0.00
+ATOM    148  C   PTH     1      11.359   7.782  15.052  0.00  0.00
+ATOM    149  C   PTH     1      11.359   8.782  15.052  0.00  0.00
+ATOM    150  C   PTH     1      11.359   9.782  15.052  0.00  0.00
+ATOM    151  C   PTH     1      11.359  10.782  14.052  0.00  0.00
+ATOM    152  C   PTH     1      11.359  17.782  -6.948  0.00  0.00
+ATOM    153  C   PTH     1      11.359  17.782  -5.948  0.00  0.00
+ATOM    154  C   PTH     1      11.359  18.782  -6.948  0.00  0.00
+ATOM    155  C   PTH     1      11.359  18.782  -5.948  0.00  0.00
+ATOM    156  C   PTH     1      11.359  18.782  -4.948  0.00  0.00
+ATOM    157  C   PTH     1      11.359  18.782  -3.948  0.00  0.00
+ATOM    158  C   PTH     1      11.359  19.782  -5.948  0.00  0.00
+ATOM    159  C   PTH     1      11.359  19.782  -4.948  0.00  0.00
+ATOM    160  C   PTH     1      11.359  19.782  -3.948  0.00  0.00
+ATOM    161  C   PTH     1      11.359  19.782  -2.948  0.00  0.00
+ATOM    162  C   PTH     1      11.359  20.782  -3.948  0.00  0.00
+ATOM    163  C   PTH     1      11.359  20.782  -2.948  0.00  0.00
+ATOM    164  C   PTH     1      11.359  21.782  -0.948  0.00  0.00
+ATOM    165  C   PTH     1      11.359  22.782  -0.948  0.00  0.00
+ATOM    166  C   PTH     1      12.359   8.782  14.052  0.00  0.00
+ATOM    167  C   PTH     1      12.359   8.782  15.052  0.00  0.00
+ATOM    168  C   PTH     1      12.359   9.782  15.052  0.00  0.00
+ATOM    169  C   PTH     1      12.359  19.782  -4.948  0.00  0.00
+ATOM    170  C   PTH     1      12.359  20.782  -2.948  0.00  0.00
+ATOM    171  C   PTH     1      12.359  21.782  -1.948  0.00  0.00
+ATOM    172  C   PTH     1      12.359  21.782  -0.948  0.00  0.00
+ATOM    173  C   PTH     1      12.359  22.782  -1.948  0.00  0.00
+ATOM    174  C   PTH     1      12.359  22.782  -0.948  0.00  0.00
+ATOM    175  C   PTH     1      12.359  22.782   0.052  0.00  0.00
+ATOM    176  C   PTH     1      12.359  23.782  -0.948  0.00  0.00
+ATOM    177  C   PTH     1      13.359  13.782  27.052  0.00  0.00
+ATOM    178  C   PTH     1      13.359  13.782  28.052  0.00  0.00
+ATOM    179  C   PTH     1      13.359  22.782  -0.948  0.00  0.00
+ATOM    180  C   PTH     1      14.359  17.782  -7.948  0.00  0.00
+ATOM    181  C   PTH     1      15.359  16.782  -8.948  0.00  0.00
+ATOM    182  C   PTH     1      15.359  16.782  -7.948  0.00  0.00
+ATOM    183  C   PTH     1      15.359  17.782  -8.948  0.00  0.00
+ATOM    184  C   PTH     1      15.359  17.782  -7.948  0.00  0.00

data/sample/mdpocket/time.txt

@@ -0,0 +1,10 @@
+0.215480
+0.271399
+0.217237
+0.212487
+0.221198
+0.217482
+0.234323
+0.224301
+0.218361
+0.211592

headers/voronoi.h

@@ -28,8 +28,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include "utils.h"
 
 
-#include "../src/qhull/qvoronoi.h"
-#include "../src/qhull/qconvex.h"
+#include "../src/qhull/src//qvoronoi/qvoronoi.h"
+#include "../src/qhull/src/qconvex/qconvex.h"
 
 #include "memhandler.h"
 

makefile

@@ -2,16 +2,16 @@
 # Makefile.
 #------------------------------------------------------------
 ARCH	    = LINUXAMD64
+export ARCH
 
 PLUGINDIR   = plugins
 
-PATH_GSL    = /home/user/gsl/
 PATH_OBJ    = obj/
 PATH_SRC    = src/
 PATH_HEADER = headers/
 PATH_BIN    = bin/
 PATH_MAN    = man/
-PATH_QHULL  = src/qhull/
+PATH_QHULL  = src/qhull/src
 
 BINDIR  = /usr/local/bin/
 MANDIR  = /usr/local/man/man8/
@@ -22,36 +22,57 @@ TPOCKET	    = tpocket
 DPOCKET	    = dpocket
 MDPOCKET    = mdpocket
 CHECK	    = pcheck
-MYPROGS	    = $(PATH_BIN)$(FPOCKET) $(PATH_BIN)$(TPOCKET) $(PATH_BIN)$(DPOCKET) $(PATH_BIN)$(MDPOCKET)
+PROGFPOCKET	    = $(PATH_BIN)$(FPOCKET) $(PATH_BIN)$(TPOCKET) $(PATH_BIN)$(DPOCKET) $(PATH_BIN)$(MDPOCKET)
+PROGMDPOCKET    = $(PATH_BIN)$(MDPOCKET)
 
-CC          = gcc
-CCQHULL	    = gcc
-LINKER      = gcc
-LINKERQHULL = gcc
+ifeq ($(CXX),g++)
+  CC          = gcc
+  CCQHULL	    = gcc
+  LINKER      = LD_LIBRARY_PATH=$(PLUGINDIR)/$(ARCH)/molfile gcc
+  LINKERQHULL = gcc
+else 
+  CCQHULL	    = clang
+  CC          = clang
+  LINKER      = LD_LIBRARY_PATH=$(PLUGINDIR)/$(ARCH)/molfile clang
+  LINKERQHULL = clang
+endif
 
 CGSL        = -DMD_NOT_USE_GSL -I$(PATH_GSL)include
 COS         = -DM_OS_LINUX
 CDEBUG      = -DMNO_MEM_DEBUG
 CWARN       = -Wall -Wextra -Wwrite-strings -Wstrict-prototypes
 
-CFLAGS      = $(CWARN) $(COS) $(CDEBUG) -O2 -g -pg -std=c99 -I$(PLUGINDIR)/include -I$(PLUGINDIR)/$(ARCH)/molfile #$(CGSL)
+CFLAGS      = $(CWARN) $(COS) $(CDEBUG) -O2 -g -pg -std=c99 -I$(PLUGINDIR)/include -I$(PLUGINDIR)/$(ARCH)/molfile
 QCFLAGS     = -O -g -pg -ansi
 
 LGSL        = -L$(PATH_GSL)lib -lgsl -lgslcblas 
-LFLAGS	    = -lm -L$(PLUGINDIR)/$(ARCH)/molfile $(PLUGINDIR)/$(ARCH)/molfile/libmolfile_plugin.a -lnetcdf -lstdc++
+LFLAGS	    = -lm -L$(PLUGINDIR)/$(ARCH)/molfile $(PLUGINDIR)/$(ARCH)/molfile/libmolfile_plugin.a -lstdc++
+NETCDFFLAGS	= -lnetcdf
+
 #
 #------------------------------------------------------------
 # BINARIES OBJECTS 
 #------------------------------------------------------------
+#QOBJS = $(PATH_QHULL)/src/qvoronoi/qvoronoi.o $(PATH_QHULL)/src/qconvex/qconvex.o
 
-QOBJS = $(PATH_QHULL)geom2.o $(PATH_QHULL)geom.o $(PATH_QHULL)global.o \
-        $(PATH_QHULL)io.o $(PATH_QHULL)io.h $(PATH_QHULL)libqhull.o \
-        $(PATH_QHULL)mem.o $(PATH_QHULL)merge.o $(PATH_QHULL)poly2.o \
-        $(PATH_QHULL)poly.o $(PATH_QHULL)qset.o \
-        $(PATH_QHULL)random.o $(PATH_QHULL)rboxlib.o \
-        $(PATH_QHULL)stat.o $(PATH_QHULL)user.o \
-        $(PATH_QHULL)usermem.o \
-        $(PATH_QHULL)userprintf.o $(PATH_QHULL)qvoronoi.o $(PATH_QHULL)qconvex.o
+QOBJS = $(PATH_QHULL)/libqhull/geom2.o $(PATH_QHULL)/libqhull/geom.o $(PATH_QHULL)/libqhull/global.o \
+        $(PATH_QHULL)/libqhull/io.o $(PATH_QHULL)/libqhull/libqhull.o \
+        $(PATH_QHULL)/libqhull/mem.o $(PATH_QHULL)/libqhull/merge.o $(PATH_QHULL)/libqhull/poly2.o \
+        $(PATH_QHULL)/libqhull/poly.o $(PATH_QHULL)/libqhull/qset.o \
+        $(PATH_QHULL)/libqhull/random.o $(PATH_QHULL)/libqhull/rboxlib.o \
+        $(PATH_QHULL)/libqhull/stat.o $(PATH_QHULL)/libqhull/user.o \
+        $(PATH_QHULL)/libqhull/usermem.o \
+        $(PATH_QHULL)/libqhull/userprintf.o $(PATH_QHULL)/libqhull/userprintf_rbox.o $(PATH_QHULL)/qvoronoi/qvoronoi.o $(PATH_QHULL)/qconvex/qconvex.o
+
+
+# QOBJS = $(PATH_QHULL)/libqhull/geom2.o $(PATH_QHULL)/libqhull/geom.o $(PATH_QHULL)/libqhull/global.o \
+#         $(PATH_QHULL)/libqhull/io.o $(PATH_QHULL)/libqhull/io.h $(PATH_QHULL)/libqhull/libqhull.o \
+#         $(PATH_QHULL)/libqhull/mem.o $(PATH_QHULL)/libqhull/merge.o $(PATH_QHULL)/libqhull/poly2.o \
+#         $(PATH_QHULL)/libqhull/poly.o $(PATH_QHULL)/libqhull/qset.o \
+#         $(PATH_QHULL)/libqhull/random.o $(PATH_QHULL)/libqhull/rboxlib.o \
+#         $(PATH_QHULL)/libqhull/stat.o $(PATH_QHULL)/libqhull/user.o \
+#         $(PATH_QHULL)/libqhull/usermem.o \
+#         $(PATH_QHULL)/libqhull/userprintf.o $(PATH_QHULL)/libqhull/userprintf_rbox.o $(PATH_QHULL)/qvoronoi/qvoronoi.o $(PATH_QHULL)/qconvex/qconvex.o
 
 CHOBJ = $(PATH_OBJ)check.o $(PATH_OBJ)psorting.o $(PATH_OBJ)pscoring.o \
 		$(PATH_OBJ)utils.o $(PATH_OBJ)pertable.o $(PATH_OBJ)memhandler.o \
@@ -62,7 +83,7 @@ CHOBJ = $(PATH_OBJ)check.o $(PATH_OBJ)psorting.o $(PATH_OBJ)pscoring.o \
 		$(PATH_OBJ)fpocket.o $(PATH_OBJ)write_visu.o  $(PATH_OBJ)fpout.o \
 		$(PATH_OBJ)atom.o $(PATH_OBJ)writepocket.o $(PATH_OBJ)voronoi_lst.o \
 		$(PATH_OBJ)neighbor.o $(PATH_OBJ)asa.o $(PATH_OBJ)clusterlib.o $(PATH_OBJ)energy.o \
-		$(QOBJS)
+		
 
 FPOBJ = $(PATH_OBJ)fpmain.o $(PATH_OBJ)psorting.o $(PATH_OBJ)pscoring.o \
 		$(PATH_OBJ)utils.o $(PATH_OBJ)pertable.o $(PATH_OBJ)memhandler.o \
@@ -85,7 +106,7 @@ TPOBJ = $(PATH_OBJ)tpmain.o $(PATH_OBJ)psorting.o $(PATH_OBJ)pscoring.o \
 		$(PATH_OBJ)fpout.o $(PATH_OBJ)atom.o $(PATH_OBJ)writepocket.o \
 		$(PATH_OBJ)voronoi_lst.o $(PATH_OBJ)neighbor.o $(PATH_OBJ)asa.o\
 		$(PATH_OBJ)clusterlib.o  $(PATH_OBJ)energy.o $(PATH_OBJ)topology.o\
-		$(QOBJS)
+		$(PATH_QHULL)/qvoronoi/qvoronoi.o $(PATH_QHULL)/qconvex/qconvex.o
 
 DPOBJ = $(PATH_OBJ)dpmain.o $(PATH_OBJ)psorting.o $(PATH_OBJ)pscoring.o \
 		$(PATH_OBJ)dpocket.o $(PATH_OBJ)dparams.o  $(PATH_OBJ)voronoi.o \
@@ -127,8 +148,17 @@ $(PATH_OBJ)%.o: $(PATH_SRC)%.cpp
 # RULES FOR EXECUTABLES
 #-----------------------------------------------------------
 
-all: $(MYPROGS) # $(PATH_BIN)$(CHECK)
-		
+all: 
+	make qhull
+	make fpocket
+	make mdpocket
+fpocket: qhull 	$(PROGFPOCKET) # $(PATH_BIN)$(CHECK)
+mdpocket: qhull $(PROGMDPOCKET)
+
+
+qhull:
+	cd src/qhull/ && make
+
 $(PATH_BIN)$(CHECK): $(CHOBJ) $(QOBJS)
 	$(LINKER) $^ -o $@ $(LFLAGS)
 
@@ -142,7 +172,7 @@ $(PATH_BIN)$(DPOCKET): $(DPOBJ) $(QOBJS)
 	$(LINKER) $^ -o $@ $(LFLAGS)
 
 $(PATH_BIN)$(MDPOCKET): $(MDPOBJ) $(QOBJS)
-	$(LINKER) $^ -o $@ $(LFLAGS)
+	$(LINKER) $^ -o $@ $(LFLAGS) $(NETCDFFLAGS)
 
 install:
 	mkdir -p $(BINDIR)
@@ -166,6 +196,7 @@ clean:
 	rm -f $(PATH_BIN)$(TPOCKET)
 	rm -f $(PATH_BIN)$(DPOCKET)
 	rm -f $(PATH_BIN)$(MDPOCKET)
+	cd src/qhull && make clean && rm lib/libqhull*.a
 
 uninstall:
 	rm -f $(PATH_BIN)$(FPOCKET) $(BINDIR)$(FPOCKET)

mdpout_descriptors.txt

@@ -1 +0,0 @@
-snapshot pock_volume pock_asa pock_pol_asa pock_apol_asa pock_asa22 pock_pol_asa22 pock_apol_asa22 nb_AS mean_as_ray mean_as_solv_acc apol_as_prop mean_loc_hyd_dens hydrophobicity_score volume_score polarity_score charge_score prop_polar_atm as_density as_max_dst ALA ARG ASN ASP CYS GLN GLU GLY HIS ILE LEU LYS MET PHE PRO SER THR TRP TYR VAL

plugins/LINUXAMD64/molfile/libmolfile_plugin.h

@@ -51,11 +51,6 @@ extern int molfile_cubeplugin_fini(void);
 extern int molfile_dcdplugin_init(void);
 extern int molfile_dcdplugin_register(void *, vmdplugin_register_cb);
 extern int molfile_dcdplugin_fini(void);
-
-extern int molfile_netcdfplugin_init(void);
-extern int molfile_netcdfplugin_register(void *, vmdplugin_register_cb);
-extern int molfile_netcdfplugin_fini(void);
-
 extern int molfile_dlpolyplugin_init(void);
 extern int molfile_dlpolyplugin_register(void *, vmdplugin_register_cb);
 extern int molfile_dlpolyplugin_fini(void);
@@ -206,6 +201,15 @@ extern int molfile_dtrplugin_fini(void);
 extern int molfile_maeffplugin_init(void);
 extern int molfile_maeffplugin_register(void *, vmdplugin_register_cb);
 extern int molfile_maeffplugin_fini(void);
+extern int molfile_vtfplugin_init(void);
+extern int molfile_vtfplugin_register(void *, vmdplugin_register_cb);
+extern int molfile_vtfplugin_fini(void);
+extern int molfile_webpdbplugin_init(void);
+extern int molfile_webpdbplugin_register(void *, vmdplugin_register_cb);
+extern int molfile_webpdbplugin_fini(void);
+extern int molfile_netcdfplugin_init(void);
+extern int molfile_netcdfplugin_register(void *, vmdplugin_register_cb);
+extern int molfile_netcdfplugin_fini(void);
 
 #define MOLFILE_INIT_ALL \
     molfile_abinitplugin_init(); \
@@ -223,7 +227,6 @@ extern int molfile_maeffplugin_fini(void);
     molfile_crdplugin_init(); \
     molfile_cubeplugin_init(); \
     molfile_dcdplugin_init(); \
-    molfile_netcdfplugin_init(); \
     molfile_dlpolyplugin_init(); \
     molfile_dsn6plugin_init(); \
     molfile_dxplugin_init(); \
@@ -274,6 +277,9 @@ extern int molfile_maeffplugin_fini(void);
     molfile_xyzplugin_init(); \
     molfile_dtrplugin_init(); \
     molfile_maeffplugin_init(); \
+    molfile_vtfplugin_init(); \
+    molfile_webpdbplugin_init(); \
+    molfile_netcdfplugin_init(); \
 
 #define MOLFILE_REGISTER_ALL(v, cb) \
     molfile_abinitplugin_register(v, cb); \
@@ -291,7 +297,6 @@ extern int molfile_maeffplugin_fini(void);
     molfile_crdplugin_register(v, cb); \
     molfile_cubeplugin_register(v, cb); \
     molfile_dcdplugin_register(v, cb); \
-    molfile_netcdfplugin_register(v, cb); \
     molfile_dlpolyplugin_register(v, cb); \
     molfile_dsn6plugin_register(v, cb); \
     molfile_dxplugin_register(v, cb); \
@@ -342,6 +347,9 @@ extern int molfile_maeffplugin_fini(void);
     molfile_xyzplugin_register(v, cb); \
     molfile_dtrplugin_register(v, cb); \
     molfile_maeffplugin_register(v, cb); \
+    molfile_vtfplugin_register(v, cb); \
+    molfile_webpdbplugin_register(v, cb); \
+    molfile_netcdfplugin_register(v, cb); \
 
 #define MOLFILE_FINI_ALL \
     molfile_abinitplugin_fini(); \
@@ -359,7 +367,6 @@ extern int molfile_maeffplugin_fini(void);
     molfile_crdplugin_fini(); \
     molfile_cubeplugin_fini(); \
     molfile_dcdplugin_fini(); \
-    molfile_netcdfplugin_fini(); \
     molfile_dlpolyplugin_fini(); \
     molfile_dsn6plugin_fini(); \
     molfile_dxplugin_fini(); \
@@ -410,6 +417,9 @@ extern int molfile_maeffplugin_fini(void);
     molfile_xyzplugin_fini(); \
     molfile_dtrplugin_fini(); \
     molfile_maeffplugin_fini(); \
+    molfile_vtfplugin_fini(); \
+    molfile_webpdbplugin_fini(); \
+    molfile_netcdfplugin_fini(); \
 
 #ifdef __cplusplus
 }