Merge lp:~nickpapior/siesta/4.0-ipi into lp:siesta/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
=== modified file 'Src/iosockets.F90'
--- Src/iosockets.F90 2016-01-25 16:00:16 +0000
+++ Src/iosockets.F90 2018-04-13 10:46:23 +0000
@@ -146,11 +146,19 @@
146 do146 do
147 if (leqi(master,'i-pi')) then147 if (leqi(master,'i-pi')) then
148 call readbuffer(socket, header, IPI_MSGLEN)148 call readbuffer(socket, header, IPI_MSGLEN)
149
150 ! Immediately stop if requested
151 if (trim(header)=='EXIT') then ! we are done!
152 call close_socket(socket)
153 call bye(myName//'STOP requested by driver')
154 end if
155
149 if (trim(header)/='STATUS') exit ! do loop156 if (trim(header)/='STATUS') exit ! do loop
150 message = "READY"157 call writebuffer(socket, "READY", IPI_MSGLEN)
151 call writebuffer(socket, message, IPI_MSGLEN)
152 elseif (leqi(master,'fsiesta')) then158 elseif (leqi(master,'fsiesta')) then
153 call readbuffer(socket, header)159 call readbuffer(socket, header)
160
161 ! Immediately stop if requested
154 if (trim(header)=='quit') then162 if (trim(header)=='quit') then
155 call writebuffer(socket,'quitting')163 call writebuffer(socket,'quitting')
156 call close_socket(socket)164 call close_socket(socket)
157165
=== modified file 'version.info'
--- version.info 2018-04-11 23:32:54 +0000
+++ version.info 2018-04-13 10:46:23 +0000
@@ -1,1 +1,1 @@
1siesta-4.0--5631siesta-4.0--563--ipi-1

Subscribers

People subscribed via source and target branches