diff options
-rw-r--r-- | interface.ccl | 5 | ||||
-rw-r--r-- | src/rdf.cc | 22 |
2 files changed, 20 insertions, 7 deletions
diff --git a/interface.ccl b/interface.ccl index 01d7a1f..95004d4 100644 --- a/interface.ccl +++ b/interface.ccl @@ -17,6 +17,7 @@ FUNCTION UniqueConfigID (CCTK_POINTER_TO_CONST IN cctkGH) PROVIDES FUNCTION UniqueConfigID \ WITH Formaline_UniqueConfigID \ LANGUAGE C +USES FUNCTION UniqueConfigID @@ -28,6 +29,7 @@ FUNCTION UniqueSourceID (CCTK_POINTER_TO_CONST IN cctkGH) PROVIDES FUNCTION UniqueSourceID \ WITH Formaline_UniqueSourceID \ LANGUAGE C +USES FUNCTION UniqueSourceID @@ -39,6 +41,7 @@ FUNCTION UniqueBuildID (CCTK_POINTER_TO_CONST IN cctkGH) PROVIDES FUNCTION UniqueBuildID \ WITH Formaline_UniqueBuildID \ LANGUAGE C +USES FUNCTION UniqueBuildID @@ -50,6 +53,7 @@ FUNCTION UniqueSimulationID (CCTK_POINTER_TO_CONST IN cctkGH) PROVIDES FUNCTION UniqueSimulationID \ WITH Formaline_UniqueSimulationID \ LANGUAGE C +USES FUNCTION UniqueSimulationID @@ -61,6 +65,7 @@ FUNCTION UniqueRunID (CCTK_POINTER_TO_CONST IN cctkGH) PROVIDES FUNCTION UniqueRunID \ WITH Formaline_UniqueRunID \ LANGUAGE C +USES FUNCTION UniqueRunID @@ -110,15 +110,23 @@ namespace Formaline const string cwd (clean (buf)); buf[0] = 0; CCTK_RunTitle (sizeof (buf) - 1, buf); - const string title (clean (buf)); + const string title(clean(buf)); + const string configID(clean(static_cast<const char *> (UniqueConfigID(0)))); + const string buildID(clean(static_cast<const char *> (UniqueBuildID(0)))); + const string sourceID(clean(static_cast<const char *> (UniqueSourceID(0)))); + const string runID(clean(static_cast<const char *> (UniqueRunID(0)))); msgbuf << "<cctk:Simulation rdf:about=\"#" << jobID << "\"" << endl - << "\tcctk:simulationID=\"" << jobID << "\"" << endl - << "\tcctk:host=\"" << host << "\"" << endl - << "\tcctk:user=\"" << user << "\"" << endl - << "\tcctk:executable=\"" << executable << "\"" << endl - << "\tcctk:version=\"" << version << "\"" << endl - << "\tcctk:title=\"" << title << "\"" << endl; + << "\tcctk:simulationID=\"" << jobID << "\"" << endl + << "\tcctk:host=\"" << host << "\"" << endl + << "\tcctk:user=\"" << user << "\"" << endl + << "\tcctk:executable=\"" << executable << "\"" << endl + << "\tcctk:version=\"" << version << "\"" << endl + << "\tcctk:title=\"" << title << "\"" << endl + << "\tcctk:configID=\"" << configID << "\"" << endl + << "\tcctk:buildID=\"" << buildID << "\"" << endl + << "\tcctk:sourceID=\"" << sourceID << "\"" << endl + << "\tcctk:runID=\"" << runID << "\"" << endl; const char* const pbsJobID = getenv ("PBS_JOBID"); if (pbsJobID) { msgbuf << "\tcctk:pbsJobID=\"" << clean (pbsJobID) << "\"" << endl; |