Repository: airavata Updated Branches: refs/heads/master 705dc5998 -> 0b6de0611
updated the input/output directory name for ultrascan. Fixed the Launch experiment. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/53977e33 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/53977e33 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/53977e33 Branch: refs/heads/master Commit: 53977e33c6c55b3a85120a74802fd768fef9a38a Parents: 8c6f9b5 Author: raminder <[email protected]> Authored: Wed Mar 12 15:24:20 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Mar 12 15:24:20 2014 -0400 ---------------------------------------------------------------------- .../samples/CreateLaunchExperimentUS3.java | 24 ++++++++++---------- .../gfac/handler/AppDescriptorCheckHandler.java | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/53977e33/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java index 8834f5a..41601d1 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java @@ -76,7 +76,7 @@ public class CreateLaunchExperimentUS3 { } } } - Thread.sleep(5000); + Thread.sleep(20000); } catch (Exception e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } @@ -100,9 +100,9 @@ public class CreateLaunchExperimentUS3 { public static void addDescriptors() throws AiravataAPIInvocationException,ApplicationSettingsException { try { UltrascanDocumentCreator documentCreator = new UltrascanDocumentCreator(getAiravataAPI()); -// documentCreator.createMPIPBSDocsTrestles(); -// documentCreator.createEchoPBSDocsforTestles(); -// documentCreator.createEchoSlurmDocsofStampede(); + documentCreator.createMPIPBSDocsTrestles(); + documentCreator.createEchoPBSDocsforTestles(); + documentCreator.createEchoSlurmDocsofStampede(); documentCreator.createMPISLURMDocsStampede(); } catch (AiravataAPIInvocationException e) { logger.error("Unable to create airavata API", e.getMessage()); @@ -146,10 +146,10 @@ public class CreateLaunchExperimentUS3 { exOut.add(output); Experiment simpleExperiment = - ExperimentModelUtil.createSimpleExperiment("project1", "admin", "echoExperiment", "SimpleEcho2", "SimpleEcho2", exInputs); + ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3EchoExperimentTrestles", "US3EchoTrestles", "US3EchoTrestles", exInputs); simpleExperiment.setExperimentOutputs(exOut); - ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "normal", 0, 0, 1, "sds128"); + ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "shared", 0, 0, 1, "sds128"); scheduling.setResourceHostId("gsissh-trestles"); UserConfigurationData userConfigurationData = new UserConfigurationData(); userConfigurationData.setAiravataAutoSchedule(false); @@ -199,10 +199,10 @@ public class CreateLaunchExperimentUS3 { exOut.add(output2); - Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3Experiment", "UltrascanAppTrestles", "UltrascanAppTrestles", exInputs); + Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3ExperimentTrestles", "US3AppTrestles", "US3AppTrestles", exInputs); simpleExperiment.setExperimentOutputs(exOut); - ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 2, 32, 0, "normal", 0, 0, 0, "uot111"); + ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 2, 32, 0, "shared", 0, 0, 0, "uot111"); scheduling.setResourceHostId("gsissh-trestles"); @@ -256,7 +256,7 @@ public class CreateLaunchExperimentUS3 { Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3ExperimentStampede", "US3AppStampede", "US3AppStampede", exInputs); simpleExperiment.setExperimentOutputs(exOut); - ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 2, 32, 0, "normal", 0, 0, 0, "TG-MCB070039N"); + ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 2, 32, 0, "development", 0, 0, 0, "TG-MCB070039N"); scheduling.setResourceHostId("gsissh-stampede"); @@ -297,12 +297,12 @@ public class CreateLaunchExperimentUS3 { exOut.add(output); Experiment simpleExperiment = - ExperimentModelUtil.createSimpleExperiment("project1", "admin", "echoExperiment", "SimpleEcho3", "SimpleEcho3", exInputs); + ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3EchoExperimentStatus", "US3EchoStampede", "US3EchoStampede", exInputs); simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceScheduling scheduling = - ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 1, 1, 1, "normal", 0, 0, 1, "TG-STA110014S"); - scheduling.setResourceHostId("stampede-host"); + ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 1, 1, 1, "development", 0, 0, 1, "TG-MCB070039N"); + scheduling.setResourceHostId("gsissh-stampede"); UserConfigurationData userConfigurationData = new UserConfigurationData(); userConfigurationData.setAiravataAutoSchedule(false); userConfigurationData.setOverrideManualScheduledParams(false); http://git-wip-us.apache.org/repos/asf/airavata/blob/53977e33/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java index 62ad1f0..a3592f8 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java @@ -56,15 +56,15 @@ public class AppDescriptorCheckHandler implements GFacHandler { appDesc.setStaticWorkingDirectory(tmpDir); } - + //FIXME: Move this input/output to application descriptor /* * Input and Output Directory */ if (appDesc.getInputDataDirectory() == null || "".equals(appDesc.getInputDataDirectory())) { - appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "inputData"); + appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "input"); } if (appDesc.getOutputDataDirectory() == null || "".equals(appDesc.getOutputDataDirectory())) { - appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "outputData"); + appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "output"); } /*
