@@ -44,6 +44,8 @@ |
|
public static final String PAYLOAD = "payload"; |
public static final String PROJECT = "project"; |
+ |
+ public static final String AGESCOMPILE = "ages_1_0"; |
|
public String data_folder = ""; |
boolean payLoad = false; |
@@ -202,7 +204,7 @@ |
// dataFolder = !payLoad ? new File(LOCATION_MNT_DATA + "/ages_projects/ages_1_0/ages-static/data/" + data_folder) : workspace().getDir(); |
// dsl = parameter().getString(KEY_SCRIPT_NP3, resources().getFile(KEY_SCRIPT_NP3).toString()); |
dsl = (LOCATION_MNT_DATA + "/ages_projects/ages_1_0/" + project + "/simulation/ages.sim"); |
- // System.out.println(" +++++++++++ DSL : " + dsl); |
+ System.out.println(" +++++++++++ DSL : " + dsl); |
// +++++++++++ DSL : /mnt/newCeph/csip-data/csip-oms/ages_projects/ages_1_0/ages-static/simulation/ages_noPLSFIR3.sim |
} |
} |
@@ -223,6 +225,7 @@ |
//File dataFolder = !payLoad ? new File(Config.getString(Config.CSIP_BIN_DIR) + "/ages_1_0/data/" + data_folder) : workspace().getDir(); |
//if (project.equals("SFIR3")) { |
File dataFolder = !payLoad ? new File(LOCATION_MNT_DATA + "/ages_projects/ages_1_0/" + project + "/data/") : workspace().getDir(); |
+ System.out.println(dataFolder); |
//} |
|
Utils.processFileParameters(parameter(), dataFolder, workspace().getDir(), agesParam); |
@@ -245,7 +248,7 @@ |
workspace().getFile("output").mkdirs(); |
workspace().getFile("logs").mkdirs(); |
|
- Utils.runAgesNew(d, workspace().getDir(), parameter(), resources(), LOG); |
+ Utils.runAgesNew(d, workspace().getDir(), parameter(), resources(), AGESCOMPILE, LOG); |
|
if (!cosu().isRequested()) { |
return; |
@@ -45,6 +45,8 @@ |
public static final String PAYLOAD = "payload"; |
public static final String PROJECT = "project"; |
|
+ public static final String AGESCOMPILE = "ages_1_0_sub"; |
+ |
public String data_folder = ""; |
boolean payLoad = false; |
|
@@ -224,6 +226,7 @@ |
//File dataFolder = !payLoad ? new File(Config.getString(Config.CSIP_BIN_DIR) + "/ages_1_0/data/" + data_folder) : workspace().getDir(); |
//if (project.equals("SFIR3")) { |
File dataFolder = !payLoad ? new File(LOCATION_MNT_DATA + "/ages_projects/ages_1_0_sub/" + project + "/data/") : workspace().getDir(); |
+ // System.out.println(dataFolder); |
//} |
|
Utils.processFileParameters(parameter(), dataFolder, workspace().getDir(), agesParam); |
@@ -246,7 +249,7 @@ |
workspace().getFile("output").mkdirs(); |
workspace().getFile("logs").mkdirs(); |
|
- Utils.runAgesNew(d, workspace().getDir(), parameter(), resources(), LOG); |
+ Utils.runAgesNew(d, workspace().getDir(), parameter(), resources(), AGESCOMPILE, LOG); |
|
if (!cosu().isRequested()) { |
return; |
@@ -560,10 +560,10 @@ |
* @throws Exception |
*/ |
public static void runAgesNew(File dsl, File ws, PayloadParameter param, |
- ServiceResources res, SessionLogger LOG) throws Exception { |
+ ServiceResources res, String ages, SessionLogger LOG) throws Exception { |
|
// Create/execute a Ages. |
- Executable p = createProcessNew(dsl, ws, param, res, LOG); |
+ Executable p = createProcessNew(dsl, ws, param, res, ages, LOG); |
int result = p.exec(); |
if (result > 0) { |
// File f = p.stderr(); |
@@ -588,13 +588,13 @@ |
* @throws java.lang.Exception |
*/ |
public static Executable createProcessNew(File dsl, File ws, |
- PayloadParameter param, ServiceResources res, SessionLogger LOG) throws Exception { |
+ PayloadParameter param, ServiceResources res, String ages, SessionLogger LOG) throws Exception { |
|
Map<String, String> sysprops = new HashMap(); |
sysprops.put("oms_prj", ws.toString()); |
- //System.out.println(" !!!! ws: " + ws.toString()); |
- sysprops.put("csip_ages", LOCATION_MNT_DATA + "/ages_projects/ages_1_0/" + param.getString(PROJECT, "SFIR3")); |
- //System.out.println(" csip_ages: " + LOCATION_MNT_DATA + "/ages_projects/ages_1_0/" + param.getString(PROJECT, "SFIR3")); |
+ // System.out.println(" !!!! ws: " + ws.toString()); |
+ sysprops.put("csip_ages", LOCATION_MNT_DATA + "/ages_projects/" + ages + "/" + param.getString(PROJECT, "SFIR3")); |
+ // System.out.println(" csip_ages: " + LOCATION_MNT_DATA + "/ages_projects/" + ages + "/" + param.getString(PROJECT, "SFIR3")); |
|
String[] jvmOptions = Binaries.asSysProps(sysprops); |
String options = param.getString(KEY_OPTIONS, ""); |