Skip to content

Commit 2ccb342

Browse files
authored
Merge pull request #1611 from virtualcell/dan-ss-slurm
Using slurm for langevin concurrent runs
2 parents 456eeea + b523fee commit 2ccb342

File tree

26 files changed

+2056
-172
lines changed

26 files changed

+2056
-172
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@
191191
<solvers-vcell-mac.version>v0.0.44-dev4</solvers-vcell-mac.version>
192192
<solvers-vcell-windows.version>v0.0.40</solvers-vcell-windows.version>
193193
<solvers-vcell-linux.version>v0.0.44-dev4</solvers-vcell-linux.version>
194-
<solvers-langevin-mac.version>1.4.4</solvers-langevin-mac.version>
195-
<solvers-langevin-windows.version>1.4.4</solvers-langevin-windows.version>
196-
<solvers-langevin-linux.version>1.4.4</solvers-langevin-linux.version>
194+
<solvers-langevin-mac.version>1.4.5</solvers-langevin-mac.version>
195+
<solvers-langevin-windows.version>1.4.5</solvers-langevin-windows.version>
196+
<solvers-langevin-linux.version>1.4.5</solvers-langevin-linux.version>
197197
</properties>
198198

199199

vcell-apiclient/src/main/java/org/vcell/api/server/AsynchMessageManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public AsynchMessageManager(ClientServerManager csm) {
8888
* no-op if already called
8989
*/
9090
public synchronized void startPolling() {
91-
if (!bPoll.get()) {
91+
if (!bPoll.get() && !clientServerManager.isVCellClientDevMain()) {
9292
bPoll.set(true);
9393
if (executorService == null) {
9494
executorService = VCellExecutorService.get();

vcell-apiclient/src/main/java/org/vcell/api/server/ClientServerManager.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ public class ClientServerManager implements ClientServerInterface {
4545
private final static Logger lg = LogManager.getLogger(ClientServerManager.class);
4646
private final VCellConnectionFactory vcellConnectionFactory;
4747
public final Auth0ConnectionUtils auth0ConnectionUtils;
48-
48+
49+
public boolean isVCellClientDevMain() {
50+
return !(vcellConnectionFactory instanceof RemoteProxyVCellConnectionFactory);
51+
}
52+
4953
public interface InteractiveContextDefaultProvider {
5054
InteractiveClientServerContext getInteractiveContext();
5155
}

0 commit comments

Comments
 (0)