number of concurrent runs management

Author: danv61

vcell-client/src/main/java/cbit/vcell/solver/ode/gui/LangevinOptionsPanel.java

@@ -125,29 +125,35 @@ public void focusLost(java.awt.event.FocusEvent e) {
 				int totalNumberOfJobs;
 				try {
 					totalNumberOfJobs = Integer.parseInt(getTotalNumberOfJobsJTextField().getText());
-					if(totalNumberOfJobs < 2) {
-						totalNumberOfJobs = LangevinSimulationOptions.DefaultTotalNumberOfJobs;
-					}
 				} catch(NumberFormatException ex) {
 					totalNumberOfJobs = solverTaskDescription.getLangevinSimulationOptions().getTotalNumberOfJobs();
-					if(totalNumberOfJobs < 2) {
-						totalNumberOfJobs = LangevinSimulationOptions.DefaultTotalNumberOfJobs;
-					}
+				}
+				if(totalNumberOfJobs < 2) {
+					totalNumberOfJobs = LangevinSimulationOptions.DefaultTotalNumberOfJobs;
+				}
+				if(totalNumberOfJobs < solverTaskDescription.getLangevinSimulationOptions().getNumberOfConcurrentJobs()) {
+					totalNumberOfJobs = solverTaskDescription.getLangevinSimulationOptions().getNumberOfConcurrentJobs();
+				}
+				if(totalNumberOfJobs > LangevinSimulationOptions.MaxTotalNumberOfJobs) {
+					totalNumberOfJobs = LangevinSimulationOptions.MaxTotalNumberOfJobs;
 				}
 				solverTaskDescription.getLangevinSimulationOptions().setTotalNumberOfJobs(totalNumberOfJobs);
 				getTotalNumberOfJobsJTextField().setText(totalNumberOfJobs+"");
 			} else if(e.getSource() == getNumberOfConcurrentJobsJTextField()) {
 				int numberOfConcurrentJobs;
 				try {
 					numberOfConcurrentJobs = Integer.parseInt(getNumberOfConcurrentJobsJTextField().getText());
-					if(numberOfConcurrentJobs < 2) {
-						numberOfConcurrentJobs = LangevinSimulationOptions.DefaultNumberOfConcurrentJobs;
-					}
 				} catch(NumberFormatException ex) {
 					numberOfConcurrentJobs = solverTaskDescription.getLangevinSimulationOptions().getNumberOfConcurrentJobs();
-					if(numberOfConcurrentJobs < 2) {
-						numberOfConcurrentJobs = LangevinSimulationOptions.DefaultNumberOfConcurrentJobs;
-					}
+				}
+				if(numberOfConcurrentJobs < 2) {
+					numberOfConcurrentJobs = LangevinSimulationOptions.DefaultNumberOfConcurrentJobs;
+				}
+				if(numberOfConcurrentJobs > solverTaskDescription.getLangevinSimulationOptions().getTotalNumberOfJobs()) {
+					numberOfConcurrentJobs = solverTaskDescription.getLangevinSimulationOptions().getTotalNumberOfJobs();
+				}
+				if(numberOfConcurrentJobs > LangevinSimulationOptions.MaxNumberOfConcurrentJobs) {
+					numberOfConcurrentJobs = LangevinSimulationOptions.MaxNumberOfConcurrentJobs;
 				}
 				solverTaskDescription.getLangevinSimulationOptions().setNumberOfConcurrentJobs(numberOfConcurrentJobs);
 				getNumberOfConcurrentJobsJTextField().setText(numberOfConcurrentJobs+"");

vcell-core/src/main/java/cbit/vcell/solver/LangevinSimulationOptions.java

@@ -28,7 +28,9 @@
 public class LangevinSimulationOptions implements Serializable, Matchable, VetoableChangeListener {
 
 	public final static int DefaultNumberOfConcurrentJobs = 20;	// used for multiple runs on the cluster
-	public final static int DefaultTotalNumberOfJobs = 100;
+	public final static int DefaultTotalNumberOfJobs = 20;
+	public final static int MaxNumberOfConcurrentJobs = 20;
+	public final static int MaxTotalNumberOfJobs = 200;			// arbitrary limit to prevent excessive use of cluster resources
 
 	public final static String Partition_Nx = "Partition Nx: ";
 	public final static String Partition_Ny = "Partition Ny: ";