Merge branch 'f-variable-temperature-restart' into f-variable-temperature

# Conflicts:
#	src/initial_read_module.f90
#	src/md_control_module.f90
This commit is contained in:
Anh Khoa Augustin Lu 2024-01-05 10:47:32 +09:00
commit 30748d6738
2 changed files with 17 additions and 8 deletions

View File

@ -2672,21 +2672,21 @@ contains
use input_module, only: leqi, chrcap
use control, only: MDn_steps
use md_control, only: md_ensemble, &
! TODO: Check if those variables are needed
flag_variable_temperature, md_variable_temperature_method, &
md_initial_temperature, md_final_temperature, md_variable_temperature_rate
use omp_module, only: init_threads
implicit none
! Passed variables
logical :: vary_mu
character(len=80) :: titles
character(len=3) :: ensemblestr
integer :: NODES
integer :: NODES
real(double) :: mu, HNL_fac
! Local variables
integer :: n, stat
integer :: threads
character(len=10) :: today, the_time
character(len=15) :: job_str
character(len=5) :: timezone
@ -2872,6 +2872,13 @@ contains
else
write(io_lun,fmt="(/4x,'The calculation will be performed on ',i5,' process')") NODES
end if
call init_threads(threads)
if(threads>1) then
write(io_lun,fmt="(/4x,'The calculation will be performed on ',i5,' threads')") threads
else if (threads==1) then
write(io_lun,fmt="(/4x,'The calculation will be performed on ',i5,' thread')") threads
end if
if(.NOT.flag_diagonalisation) &
write(io_lun,fmt='(10x,"Density Matrix range = ",f7.4,1x,a2)') &

View File

@ -52,7 +52,7 @@
!! 2022/09/29 16:46 dave
!! Moved subroutines from control and tidied output
!! 2023/10/09 lu
!! Added variables XXXX to enable simulations with a variable temperature
!! Added variables to enable simulations with a variable temperature
!! SOURCE
!!
module md_control
@ -2530,11 +2530,11 @@ contains
!! PURPOSE
!! Read thermostat temperature for MD restart
!! AUTHOR
!! Zamaan Raza
!! Anh Khoa Augustin Lu
!! CREATION DATE
!! 2018/08/12 10:19
!! 2023/12/26
!! MODIFICATION HISTORY
!! 2023/10/xx Anh Khoa Augustin Lu
!! 2023/12/26 Anh Khoa Augustin Lu
!! Read temperature of the thermostat for restart runs
!! SOURCE
!!
@ -2559,6 +2559,8 @@ contains
end if
call gcopy(th%T_ext)
if (inode == ionode) then
write(io_lun, *) "Read thermostat temperature : ", th%T_ext , "K"
end if
@ -2575,7 +2577,7 @@ contains
!! CREATION DATE
!! 2018/08/12 10:19
!! MODIFICATION HISTORY
!! 2023/10/xx Anh Khoa Augustin Lu
!! 2023/12/26 Anh Khoa Augustin Lu
!! Read temperature of the thermostat for restart runs
!! SOURCE
!!