Siesta

Merge lp:~nickpapior/siesta/4.0-ipi into lp:siesta/4.0

  1. 4.0-ipi
  2. Merge into rel-4.0
Proposed by Nick Papior
Status: Merged
Merged at revision: 565
Proposed branch: lp:~nickpapior/siesta/4.0-ipi
Merge into: lp:siesta/4.0
Diff against target: 32 lines (+11/-3)
2 files modified
Src/iosockets.F90 (+10/-2)
version.info (+1/-1)
To merge this branch: bzr merge lp:~nickpapior/siesta/4.0-ipi
Reviewer Review Type Date Requested Status
Alberto Garcia Approve
Review via email: mp+343179@code.launchpad.net

Commit message

Fixes of i-PI EXIT status.

To post a comment you must log in.
Revision history for this message
Alberto Garcia (albertog) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Src/iosockets.F90'
2--- Src/iosockets.F90 2016-01-25 16:00:16 +0000
3+++ Src/iosockets.F90 2018-04-13 10:46:23 +0000
4@@ -146,11 +146,19 @@
5 do
6 if (leqi(master,'i-pi')) then
7 call readbuffer(socket, header, IPI_MSGLEN)
8+
9+ ! Immediately stop if requested
10+ if (trim(header)=='EXIT') then ! we are done!
11+ call close_socket(socket)
12+ call bye(myName//'STOP requested by driver')
13+ end if
14+
15 if (trim(header)/='STATUS') exit ! do loop
16- message = "READY"
17- call writebuffer(socket, message, IPI_MSGLEN)
18+ call writebuffer(socket, "READY", IPI_MSGLEN)
19 elseif (leqi(master,'fsiesta')) then
20 call readbuffer(socket, header)
21+
22+ ! Immediately stop if requested
23 if (trim(header)=='quit') then
24 call writebuffer(socket,'quitting')
25 call close_socket(socket)
26
27=== modified file 'version.info'
28--- version.info 2018-04-11 23:32:54 +0000
29+++ version.info 2018-04-13 10:46:23 +0000
30@@ -1,1 +1,1 @@
31-siesta-4.0--563
32+siesta-4.0--563--ipi-1

Subscribers

People subscribed via source and target branches