1) Threading cleanup in src_CSA & src_CSA_DiL

2) Makefile verbose turned off for "Release" builds
3) fixed missing printmat.f in cluster/wham/src/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87cffd9..3a2d1d7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,8 +70,6 @@ ENDMACRO (CINFO_FORMAT)
 include(CTest)
 enable_testing()
  
-# Set makefile verbose on
-set( CMAKE_VERBOSE_MAKEFILE 1 )
 
 #======================================
 # Fortran compilers stuff
@@ -91,7 +89,16 @@ if (NOT CMAKE_BUILD_TYPE)
   set (CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release." FORCE)
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "None" "Debug" "Release" )
 endif (NOT CMAKE_BUILD_TYPE)
-   
+
+
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+  # Set makefile verbosity off for Release builds
+  set( CMAKE_VERBOSE_MAKEFILE 0 )
+else()
+  # Set makefile verbosity on for other builds
+  set( CMAKE_VERBOSE_MAKEFILE 1 )
+endif (CMAKE_BUILD_TYPE STREQUAL "Release")
+
 #=======================================  
 # Set the varous build variables 
 #=======================================

diff --git a/source/cluster/wham/src/CMakeLists.txt b/source/cluster/wham/src/CMakeLists.txt
index 83e34ad..32f25a7 100644 (file)
--- a/source/cluster/wham/src/CMakeLists.txt
+++ b/source/cluster/wham/src/CMakeLists.txt
@@ -28,6 +28,7 @@ set(UNRES_CLUSTER_WHAM_SRC0
        noyes.f
        parmread.F
        pinorm.f
+       printmat.f
        probabl.F
        read_coords.F
        readpdb.f

diff --git a/source/unres/src_CSA/readrtns_csa.F b/source/unres/src_CSA/readrtns_csa.F
index 9ab4510..77e744d 100644 (file)
--- a/source/unres/src_CSA/readrtns_csa.F
+++ b/source/unres/src_CSA/readrtns_csa.F
@@ -808,9 +808,6 @@ c            call gen_rand_conf(itmp,*31)
 
       endif 
 C Generate distance constraints, if the PDB structure is to be regularized. 
-      if (nthread.gt.0) then
-        call read_threadbase
-      endif
       call setup_var
       if (me.eq.king .or. .not. out1file)
      & call intout

diff --git a/source/unres/src_CSA_DiL/readrtns_csa.F b/source/unres/src_CSA_DiL/readrtns_csa.F
index a6ed1f8..112514f 100644 (file)
--- a/source/unres/src_CSA_DiL/readrtns_csa.F
+++ b/source/unres/src_CSA_DiL/readrtns_csa.F
@@ -809,9 +809,6 @@ c            call gen_rand_conf(itmp,*31)
 
       endif 
 C Generate distance constraints, if the PDB structure is to be regularized. 
-      if (nthread.gt.0) then
-        call read_threadbase
-      endif
       call setup_var
       if (me.eq.king .or. .not. out1file)
      & call intout