Verified Commit 93e942ef authored by Jellby's avatar Jellby

Cosmetic changes

Removed unused routine and interface. Change CMakeLists.txt file
because apparently NAG doesn't search for module files in the
directory where it creates module files (doh!)
parent fcd95ebf
Pipeline #57613018 (#1773) passed with stages
in 8 minutes and 27 seconds
...@@ -2603,16 +2603,16 @@ foreach (util ${utils}) ...@@ -2603,16 +2603,16 @@ foreach (util ${utils})
# ignore empty directories # ignore empty directories
if (NOT "${source}" STREQUAL "") if (NOT "${source}" STREQUAL "")
add_library (${util}_obj OBJECT ${source}) add_library (${util}_obj OBJECT ${source})
if (BUILD_SHARED_LIBS)
set_target_properties (${util}_obj PROPERTIES
POSITION_INDEPENDENT_CODE "TRUE")
endif ()
if (SINGLE_MOD_DIR) if (SINGLE_MOD_DIR)
set_target_properties (${util}_obj PROPERTIES set (mod_dir ${MAIN_MOD_DIR}/_single)
Fortran_MODULE_DIRECTORY ${MAIN_MOD_DIR}/_single)
else () else ()
set (mod_dir ${MAIN_MOD_DIR}/${util})
endif ()
set_target_properties (${util}_obj PROPERTIES Fortran_MODULE_DIRECTORY ${mod_dir})
if (BUILD_SHARED_LIBS)
set_target_properties (${util}_obj PROPERTIES set_target_properties (${util}_obj PROPERTIES
Fortran_MODULE_DIRECTORY ${MAIN_MOD_DIR}/${util}) POSITION_INDEPENDENT_CODE "TRUE")
endif () endif ()
# utility-specific compile definitions # utility-specific compile definitions
...@@ -2620,7 +2620,7 @@ foreach (util ${utils}) ...@@ -2620,7 +2620,7 @@ foreach (util ${utils})
set_target_properties (${util}_obj PROPERTIES COMPILE_DEFINITIONS "${${util}_defs}") set_target_properties (${util}_obj PROPERTIES COMPILE_DEFINITIONS "${${util}_defs}")
endif () endif ()
# utility-specific include directories # utility-specific include directories
list (APPEND ${util}_incs ${PROJECT_SOURCE_DIR}/${${util}_src}) list (APPEND ${util}_incs ${PROJECT_SOURCE_DIR}/${${util}_src} ${mod_dir})
foreach (inc ${${util}_incs}) foreach (inc ${${util}_incs})
target_include_directories (${util}_obj PRIVATE ${inc}) target_include_directories (${util}_obj PRIVATE ${inc})
endforeach () endforeach ()
...@@ -2705,12 +2705,12 @@ foreach (prog ${progs}) ...@@ -2705,12 +2705,12 @@ foreach (prog ${progs})
if (NOT "${source}" STREQUAL "") if (NOT "${source}" STREQUAL "")
add_library (${prog} OBJECT ${source}) add_library (${prog} OBJECT ${source})
if (SINGLE_MOD_DIR) if (SINGLE_MOD_DIR)
set_target_properties (${prog} PROPERTIES set (mod_dir ${MAIN_MOD_DIR}/_single)
Fortran_MODULE_DIRECTORY ${MAIN_MOD_DIR}/_single)
else () else ()
set_target_properties (${prog} PROPERTIES set (mod_dir ${MAIN_MOD_DIR}/${prog})
Fortran_MODULE_DIRECTORY ${MAIN_MOD_DIR}/${prog})
endif () endif ()
set_target_properties (${prog} PROPERTIES Fortran_MODULE_DIRECTORY ${mod_dir})
# programs in "proglib" have their libraries compiled as utils # programs in "proglib" have their libraries compiled as utils
if (BUILD_SHARED_LIBS AND ";${proglib};" MATCHES ";${prog};") if (BUILD_SHARED_LIBS AND ";${proglib};" MATCHES ";${prog};")
set_target_properties (${prog} PROPERTIES set_target_properties (${prog} PROPERTIES
...@@ -2722,7 +2722,7 @@ foreach (prog ${progs}) ...@@ -2722,7 +2722,7 @@ foreach (prog ${progs})
set_target_properties (${prog} PROPERTIES COMPILE_DEFINITIONS "${${prog}_defs}") set_target_properties (${prog} PROPERTIES COMPILE_DEFINITIONS "${${prog}_defs}")
endif () endif ()
# program-specific include directories # program-specific include directories
list (APPEND ${prog}_incs ${PROJECT_SOURCE_DIR}/${${prog}_src}) list (APPEND ${prog}_incs ${PROJECT_SOURCE_DIR}/${${prog}_src} ${mod_dir})
foreach (inc ${${prog}_incs}) foreach (inc ${${prog}_incs})
target_include_directories (${prog} PRIVATE ${inc}) target_include_directories (${prog} PRIVATE ${inc})
endforeach () endforeach ()
......
************************************************************************
* This file is part of OpenMolcas. *
* *
* OpenMolcas is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License, v. 2.1. *
* OpenMolcas is distributed in the hope that it will be useful, but it *
* is provided "as is" and without any express or implied warranties. *
* For more details see the full text of the license in the file *
* LICENSE or in <http://www.gnu.org/licenses/>. *
* *
* Copyright (C) 2004, Alexander Wolf *
* 2004, Markus Reiher *
************************************************************************
character*(2) function int2char2 (number)
c
c*************************************************************************
c
c This SR belongs to dkhparser_numeric (dkhparser2).
c
c written by: Alexander Wolf and Markus Reiher (Univ. Jena)
c
c version: 2.0.1
c
c THIS ORIGINAL SUB IS KEPT BECAUSE THE ROUTINE IS CALLED BY sew_molpro.f
c IT IS IDENTICAL WITH dkh_int2char2 AND MAY BE REMOVED FROM THE PACKAGE
c IN PROGRAM ENVIRONMENTS OTHER THAN MOLPRO OR MOLCAS
c
c first version: 10.04.2004 (Theoretical Chemistry, Univ. Bonn)
c
c*************************************************************************
c
implicit none
c
integer number,idum(2),j
character*(2) string
c
c Translate integer number --> character string of length 2
c
idum(1)=INT(number/10)
idum(2)=INT(number-idum(1)*10)
c
do 100 j=1,2
if (idum(j).eq.0) string(j:j)='0'
if (idum(j).eq.1) string(j:j)='1'
if (idum(j).eq.2) string(j:j)='2'
if (idum(j).eq.3) string(j:j)='3'
if (idum(j).eq.4) string(j:j)='4'
if (idum(j).eq.5) string(j:j)='5'
if (idum(j).eq.6) string(j:j)='6'
if (idum(j).eq.7) string(j:j)='7'
if (idum(j).eq.8) string(j:j)='8'
if (idum(j).eq.9) string(j:j)='9'
100 continue
c
int2char2(1:2)=string(1:2)
c
return
end
...@@ -18,12 +18,6 @@ ...@@ -18,12 +18,6 @@
use XYZ use XYZ
#endif #endif
Implicit Real*8 (a-h,o-z) Implicit Real*8 (a-h,o-z)
Interface
Function INT2CHAR(n,iBase)
Integer :: n,iBase
Character(Len=iBase) :: INT2CHAR
End Function INT2CHAR
End Interface
External NucExp External NucExp
#include "para_info.fh" #include "para_info.fh"
* *
...@@ -1436,11 +1430,11 @@ C Write (LuWr,*) 'RMax_R=',RMax_R ...@@ -1436,11 +1430,11 @@ C Write (LuWr,*) 'RMax_R=',RMax_R
Call WarningMessage(2,' Too many atoms in Seward') Call WarningMessage(2,' Too many atoms in Seward')
Call Quit_OnUserError() Call Quit_OnUserError()
Else Else
if (ii .LT. 1000) then If(ii.LT.1000) Then
CHAR4 = '_'//str(ii) CHAR4 = '_'//str(ii)
else Else
CHAR4 = str(ii) CHAR4 = str(ii)
end if End If
End If End If
nCnt = nCnt + 1 nCnt = nCnt + 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment