1. Fixed merge conflicts
[unres.git] / source / unres /
2012-10-09 Bartlomiej Zaborowski1. Fixed merge conflicts
2012-10-09 Bartlomiej Zaborowski1. Added new files to PARAM
2012-10-02 Bartlomiej ZaborowskiMerge branch 'bartek2' into bartek
2012-10-02 Bartlomiej Zaborowskizmiana do DiL
2012-10-02 Bartlomiej ZaborowskiRozgrzebany DIL
2012-10-02 Bartlomiej ZaborowskiD i L aminokwasy dzialajace dla src_CSA
2012-09-26 Bartlomiej Zaborowski"DiL zmiana w param read i tuz przed testami"
2012-09-26 Bartlomiej Zaborowski"Przygotowanie CSA do D i L aminokwasow"
2012-08-08 Bartlomiej ZaborowskiCASP3 force field deleted. Fixed merge conflicts.
2012-08-08 Bartlomiej ZaborowskiOld force fields removed, new ones (GAB, E0LL2Y) added.
2012-07-19 Dawid Jagielacinfo.f generation and macro for unres MD
2012-07-18 Adam Kazimierz Sie... Revert "Merge branch 'adasko' into devel"
2012-07-17 Adam Kazimierz Sie... Merge branch 'adasko' into devel
2012-07-17 Adam Kazimierz Sie... D i L aminokwasy dzialajace dla src_MD
2012-07-09 Adam Kazimierz Sie... D i L aminokwasy tuz przed testami
2012-07-06 Adam Kazimierz Sie... zmiana do DiL
2012-07-05 Adam LiwoMerge branch 'adam' into devel
2012-07-05 Adam LiwoMinor change
2012-07-05 Adam LiwoMinor change
2012-07-05 Adam Kazimierz Sie... zmiana binarki...
2012-07-05 Adam LiwoMerge branch 'adam' into devel
2012-07-05 Adam Liwo5/7/2012 by Adam
2012-07-05 Adam Kazimierz Sie... DIL zmiana w param read
2012-07-05 Adam Kazimierz Sie... hotfix of SCCOR potentials
2012-07-05 Adam Kazimierz Sie... hotfix do potencjalow AM1
2012-07-05 Adam Kazimierz Sie... Rozgrzebany DIL
2012-06-27 Adam Kazimierz Sie... Merge branch 'adasko' into devel
2012-06-27 Adam Kazimierz Sie... Wprowadzenie SCCOR do WHAMa i CLUSTROWNIA
2012-06-20 Dawid JagielaLAM/MPI boot ctest modification
2012-06-19 Dawid Jagielaadded -cpp flag to force preprocesing for all files...
2012-06-19 Dawid JagielaMoved ifdef MOMENT part from COMMON.CONTACTS to COMMON...
2012-06-18 Dawid Jagielaenable compiler preprocesor flags for non-standard...
2012-06-18 Dawid Jagielafixed merge conflict in readrtns_csa.F
2012-06-18 Dawid Jagielafixed merge renamed source file: newconf.f is now newconf.F
2012-06-18 Dawid Jagielaresolving merge conflicts
2012-06-18 Adam LiwoMerge branch 'devel' of mmka.chem.univ.gda.pl:unres...
2012-06-18 Adam LiwoMerge branch 'adam' into devel
2012-06-18 Dawid Jagielafixed indent for gfortran build in source/unres/src_MD...
2012-06-18 Adam Kazimierz Sie... Merge branch 'adasko' into devel
2012-06-18 Adam Kazimierz Sie... zmiany po usunieciu diagnostyki...
2012-06-15 Adam Liwo6/15/2012 by Adam
2012-06-15 Adam Kazimierz Sie... dzialajacy grad check....
2012-06-14 Adam Liwo6/14/12 by Adam: unnecessary files deleted
2012-06-14 Adam Liwo6/14/12 by Adam - changes committed
2012-06-14 Adam Liwo6/14/2012 by Adam
2012-06-14 Adam Kazimierz Sie... Dzialajacy INTERTYP=1 i INTERTYP=2
2012-06-11 Adam Liwo6/11/2012 by Adam
2012-06-11 Dawid Jagielafix of xdrf2ang
2012-06-11 Cezary CzaplewskiDFA is switched off by default
2012-06-11 Adam Liwo6/11/2012 Changes of the CSA version
2012-06-11 Adam Liwo6/11/2012 Update of the CSA version
2012-06-08 Dawid Jagielaadded ctest/1LE1_mremd_MD000.cx for xdrf2pdb-m testing
2012-06-05 Dawid JagielaUNRES single MD for MPI ctest file permissions fix
2012-06-05 Adam Kazimierz Sie... UDALO SIE TERAZ DEBUG
2012-06-05 Dawid Jagielaadded MPI ctest for unres single MD
2012-05-29 Adam Kazimierz Sie... kolejna
2012-05-29 Adam Kazimierz Sie... zmienionwe zostaly i zostal chyba tylko int to cart...
2012-05-29 Adam Kazimierz Sie... sadas
2012-05-27 Dawid Jagielacompile_definitions workaround (cmake does not pass...
2012-05-26 Dawid Jagielaadded header for proc_proc.c
2012-05-26 Dawid JagielaEOF warning fix
2012-05-26 Dawid Jagielacompinfo.c rewrite
2012-05-26 Dawid Jagielavoid cast on fgets & fscanf in compinfo.c
2012-05-26 Dawid Jagielacompinfo.c warning supresion
2012-05-18 Cezary CzaplewskiMerge branch 'devel' of mmka:unres into devel
2012-05-18 Cezary Czaplewskian example for MIN only version of unres, corrected...
2012-05-18 Dawid JagielaMerge branch 'feature-cmake' into devel
2012-05-16 Dawid Jagielaadded CMake files to build cluster/wham/src-M
2012-05-15 Dawid JagielaAdded CMake files for building source/wham/src-M
2012-05-14 Dawid Jagielaascii frames closed: unres/src_MD-M/energy_p_new_barr...
2012-05-14 Dawid Jagiela1) ASCII art frame fix in unres/src_MD-M/energy_p_new_b...
2012-05-14 Dawid Jagielaadded cmake files to build source/wham/src under ifort
2012-05-14 Dawid Jagielafixed more typos
2012-05-14 Dawid Jagielafixed typo
2012-05-14 Dawid Jagielaprng_32.F/prng.f fix for intel compiler
2012-05-14 Dawid Jagiela1) moved xdrf library to source/lib/xdrf - CMake files...
2012-05-13 Adam Liwo5/13/2012 by Adam
2012-05-13 Dawid Jagielalinking pthreads for unres/src_MIN
2012-05-13 Adam Liwo5/13/2012 by Adam
2012-05-12 Dawid Jagielamodified: energy_p_new_barrier.F - closed ascii art...
2012-05-11 Dawid Jagielaadded/modified CMake files for all subdirs in source...
2012-05-10 Dawid Jagielaclosing asci-art frames in energy_p_new_barrier.F files...
2012-05-10 Dawid Jagielafixes for unres/src_MIN build in ifort
2012-05-10 Dawid Jagiela- added UNRES Multichain examples
2012-05-10 Dawid Jagielaadded 32/64-bit architecture detection
2012-05-10 Dawid Jagieladeleted: source/unres/src_MD-M/xdrf_em64/libxdrf.m4~
2012-05-10 Adam Liwo5/10/2012 by Adam
2012-05-09 Dawid Jagielasrc_MD-M CMake build files + junkfiles cleanup
2012-05-09 Cezary Czaplewskicompilation of DFA/CSA code
2012-05-09 Cezary CzaplewskiMerge branch 'devel' of mmka:unres into devel
2012-05-09 Cezary CzaplewskiDFA is switched off by default
2012-05-08 Dawid Jagielafixed test_single_ala.sh to run binary from current...
2012-05-08 Dawid Jagielafixed "rm tmptmp" of notexisting file in compinfo.c
2012-05-07 Dawid Jagielanew gfortran fix
2012-05-07 Dawid Jagielafixed ctest/cmake files for src_MD build
2012-04-23 Dawid JagielaAdded test MPI preprocessor compile definitions
2012-04-19 Dawid JagielaRevert "Revert "CMake file for xdrf library""
2012-04-19 Dawid JagielaRevert "CMake file for xdrf library"
2012-04-19 Dawid JagielaCMake file for xdrf library
2012-04-19 Dawid JagielaCMake project files added
next