Add option to convert cooling times in output file to seconds

src/CoolingTime.C

@@ -12,6 +12,7 @@
 
 #include "CoolingTime.h"
 #include "Input_def.h"
+#include "Output_def.h"
 
 /***************************
  ********* Service *********
@@ -131,7 +132,7 @@ int CoolingTime::makeCoolingTimes(double *& coolingTimes)
 
 /** There is a column for the isotope, a column for the @shutdown
     result, and then a column for each after-shutdown cooling time. */
-void CoolingTime::writeHeader()
+void CoolingTime::writeHeader(int cooltime_units)
 {
   CoolingTime *ptr = this;
   char textBuf[16];
@@ -141,7 +142,16 @@ void CoolingTime::writeHeader()
   while (ptr->next != NULL)
     {
       ptr = ptr->next;
-      sprintf(textBuf,"%7g %c   ",ptr->coolingTime, ptr->units);
+      if (cooltime_units == COOLTIME_S) // print cooling time converted to seconds
+      {
+        double t_sec = convertTime(ptr->coolingTime, ptr->units);
+        sprintf(textBuf, "%9.3e s ", t_sec);
+      }
+      else  // print cooling time in default units
+      {
+        sprintf(textBuf, "%7g %c   ", ptr->coolingTime, ptr->units);
+      }
+
       cout << textBuf;
     }
   cout << endl;
@@ -168,7 +178,7 @@ void CoolingTime::getCoolTimesStrings(std::vector<std::string>& coolTimesList)
 /** There is a  column indicating the counter for the total in question,
     one column for @ shutdown results, and then one column for each of the
     after-shutdown cooling times. */
-void CoolingTime::writeTotalHeader(const char* type)
+void CoolingTime::writeTotalHeader(const char* type, int cooltime_units)
 {
   CoolingTime *ptr = this;
   char textBuf[16];
@@ -181,7 +191,16 @@ void CoolingTime::writeTotalHeader(const char* type)
   while (ptr->next != NULL)
   {
       ptr = ptr->next;
-      sprintf(textBuf,"%7g %c   ",ptr->coolingTime, ptr->units);
+      if (cooltime_units == COOLTIME_S) // print cooling time converted to seconds
+      {
+        double t_sec = convertTime(ptr->coolingTime, ptr->units);
+        sprintf(textBuf, "%9.3e s ", t_sec);
+      }
+      else  // print cooling time in default units
+      {
+        sprintf(textBuf, "%7g %c   ", ptr->coolingTime, ptr->units);
+      }
+
       cout << textBuf;
   }
   cout << endl;

src/CoolingTime.h

@@ -49,13 +49,13 @@ class CoolingTime
   int makeCoolingTimes(double *&);
 
   /// This function writes a header for the standard response table.
-  void writeHeader();
+  void writeHeader(int cooltime_units);
 
   /// This function returns a string containing the nth shutdown time
   void getCoolTimesStrings(std::vector<std::string>&);
 
   /// This function writes a header for the table of totals. 
-  void writeTotalHeader(const char*);
+  void writeTotalHeader(const char*, int cooltime_units);
 
   /// This function writes an appropriately sized separator of
   /// "===...===" to frame the table.

src/Loading.C

@@ -470,7 +470,7 @@ void Loading::write(int response, int writeComp, CoolingTime* coolList,
   cout << Result::getReminderStr() << endl;
 
   /* write header for totals */
-  coolList->writeTotalHeader("zone");
+  coolList->writeTotalHeader("zone", Result::getCooltimeMode());
 
   /* for each zone */
   while (ptr->next != NULL)

src/Mixture.C

@@ -616,7 +616,7 @@ void Mixture::write(int response, int writeComp, CoolingTime* coolList,
   cout << Result::getReminderStr() << endl;
 
   /* write header for totals */
-  coolList->writeTotalHeader("mixture");
+  coolList->writeTotalHeader("mixture", Result::getCooltimeMode());
 
   /* for each mixture */
   while (ptr->next != NULL)

src/OutputFormat.C

@@ -51,14 +51,18 @@ OutputFormat::OutputFormat(int type)
   strcpy(normUnits,"/cm3");
   normType = 1;
 
+  cooltimeUnits = new char[5];
+  strcpy(cooltimeUnits,"def");
+  cooltimeType = 1;
+
   gammaSrc = NULL;
   contactDose = NULL;
 
   next = NULL;
 }
 
 OutputFormat::OutputFormat(const OutputFormat& o) :
-  resolution(o.resolution), outTypes(o.outTypes), normType(o.normType), actMult(o.actMult)
+  resolution(o.resolution), outTypes(o.outTypes), normType(o.normType), actMult(o.actMult), cooltimeType(o.cooltimeType)
 
 {
   actUnits = new char[strlen(o.actUnits)+1];
@@ -67,13 +71,17 @@ OutputFormat::OutputFormat(const OutputFormat& o) :
   normUnits = new char[strlen(o.normUnits)+1];
   strcpy(normUnits,o.normUnits);
 
+  cooltimeUnits = new char[strlen(o.cooltimeUnits)+1];
+  strcpy(cooltimeUnits,o.cooltimeUnits);
+
   next = NULL;
 }
 
 OutputFormat::~OutputFormat()
 {
   delete[] actUnits;
   delete[] normUnits;
+  delete[] cooltimeUnits;
   delete gammaSrc;
   delete contactDose;
   delete next;
@@ -141,6 +149,7 @@ OutputFormat* OutputFormat::getOutFmts(istream& input)
       switch (1<<type)
 	{
 	case OUTFMT_UNITS:
+	  {	
 	  next->outTypes |= 1<<type;
 	  delete[] next->actUnits;
 	  input >> token;
@@ -175,7 +184,34 @@ OutputFormat* OutputFormat::getOutFmts(istream& input)
 	      next->normType = OUTNORM_CM3;
 	      break;
 	    }
-	  break;
+
+	  delete[] next->cooltimeUnits;
+	  next->cooltimeUnits = new char[strlen(token)+1];
+	  strcpy(next->cooltimeUnits, "");
+
+	  next->cooltimeType = COOLTIME_DEF;
+	  std::streampos pos = input.tellg();
+
+	  if (input >> token)
+		{
+		if (tolower(token[0]) == 's')
+			{
+			next->cooltimeType = COOLTIME_S;
+
+			delete[] next->cooltimeUnits;
+			next->cooltimeUnits = new char[strlen(token)+1];
+			strcpy(next->cooltimeUnits, token);
+			}
+		else if (tolower(token[0]) == 'd')
+			{
+			input.seekg(pos);
+			}
+		else
+			{
+			error(230, "Unknown cooling time unit '%s'", token);		
+			}
+		}
+	  }
 	case OUTFMT_WDR:
           next->outTypes |= 1<<type;
 	  input >> token;
@@ -282,7 +318,7 @@ void OutputFormat::write(Volume* volList, Mixture* mixList, Loading* loadList,
       /* units */
       outTypeNum = 0;
       cout << "\t" << Out_Types_Str[outTypeNum] << ": "
-	   << ptr->actUnits << " " << ptr->normUnits << endl;
+	   << ptr->actUnits << " " << ptr->normUnits << " " << ptr->cooltimeUnits << endl;
       /* regular singular responses */
       for (++outTypeNum;outTypeNum<lastSingularResponse;outTypeNum++)
 	if (ptr->outTypes & 1<<outTypeNum)
@@ -291,32 +327,32 @@ void OutputFormat::write(Volume* volList, Mixture* mixList, Loading* loadList,
 	      {
 	      case (OUTFMT_ACT):
 		sprintf(buffer,Out_Types_Str[outTypeNum],
-			ptr->actUnits,ptr->normUnits);
+			ptr->actUnits,ptr->normUnits,ptr->cooltimeUnits);
 		break;
 	      case (OUTFMT_SRC) :
 		sprintf(buffer,Out_Types_Str[outTypeNum],
 				/* deliver gamma src filename, */
-			ptr->normUnits, ptr->gammaSrc->getFileName(),ptr->actUnits,ptr->normUnits); 
+			ptr->normUnits, ptr->gammaSrc->getFileName(),ptr->actUnits,ptr->normUnits,ptr->cooltimeUnits); 
 		break;
 	      case (OUTFMT_CDOSE) :
 		sprintf(buffer,Out_Types_Str[outTypeNum],
-			ptr->contactDose->getFileName());
+			ptr->contactDose->getFileName(),ptr->cooltimeUnits);
 		break;
 	      case (OUTFMT_ADJ) :
 		sprintf(buffer,Out_Types_Str[outTypeNum],
-			ptr->adjointDose->getFileName());
+			ptr->adjointDose->getFileName(),ptr->cooltimeUnits);
 		break;
 	      case (OUTFMT_EXP) : 
 		sprintf(buffer, Out_Types_Str[outTypeNum],
-			ptr->exposureDose->getFileName());
+			ptr->exposureDose->getFileName(),ptr->cooltimeUnits);
 		break;
 	      case (OUTFMT_EXP_CYL_VOL) :
 		sprintf(buffer, Out_Types_Str[outTypeNum],
-			ptr->exposureCylVolDose->getFileName());
+			ptr->exposureCylVolDose->getFileName(),ptr->cooltimeUnits);
 		break;
 	      default:
 		sprintf(buffer,Out_Types_Str[outTypeNum],
-			ptr->normUnits);
+			ptr->normUnits,ptr->cooltimeUnits);
 	      }
 	    cout << "\t" << buffer << endl;
 	  }
@@ -333,7 +369,7 @@ void OutputFormat::write(Volume* volList, Mixture* mixList, Loading* loadList,
       cout << endl << endl;
 
       /* set units for activity */
-      Result::setNorm(ptr->actMult,ptr->normType);
+      Result::setNorm(ptr->actMult,ptr->normType,ptr->cooltimeType);
 
       /* for each indicated response */
       for (outTypeNum=firstResponse;outTypeNum<lastSingularResponse;outTypeNum++) {

src/OutputFormat.h

@@ -44,6 +44,10 @@ class OutputFormat
   /// including metric prefix) is being used for this output block.
   int normType;
 
+  /// This is used to store the type of units used for the cooling times
+  /// in the output tables (default vs seconds)
+  int cooltimeType;
+
   /// This STL set is used to store a unique list of filenames.    
   filenameList wdrFilenames;
 
@@ -55,6 +59,10 @@ class OutputFormat
   /// the results are being shown in (cm3 v. m3 v. g v. kg).
   char *normUnits;
 
+  /// This string is used to display cooling time units in the default (def)
+  /// units or in seconds (s) in the header of the output tables
+  char *cooltimeUnits;
+
   /// This stores the multiplication factor for the activity units.  
   /** If necessary (based on actUnits), it will store the conversion
       between Ci and Bq. */

src/Output_def.h

@@ -31,4 +31,7 @@
 #define CM3_M3           1e-6
 #define G_KG             1e-3
 
+#define COOLTIME_DEF           1
+#define COOLTIME_S             2
+
 #endif

src/Result.C

@@ -35,6 +35,7 @@ double Result::actMult = 1;
 double Result::metricMult = 1;
 GammaSrc* Result::gammaSrc = NULL;
 char* Result::outReminderStr = NULL;
+int Result::cooltime_units = COOLTIME_DEF;
 
 /** When called with no arguments, the default constructor sets 'kza'
     and 'next' to 0 and NULL, respectively.  Otherwise, they are set,
@@ -339,7 +340,7 @@ void Result::write(int response, int targetKza, Mixture *mixPtr,
   cout << outReminderStr << endl;;
 
   /* write a standard header for this table */
-  coolList->writeHeader();
+  coolList->writeHeader(Result::getCooltimeMode());
 
   if (response == OUTFMT_SRC)
     {
@@ -592,12 +593,19 @@ void Result::readDump()
     }
 }
 
-void Result::setNorm(double passedActMult, int normType)
+int Result::getCooltimeMode()
+{
+    return cooltime_units;
+}
+
+
+void Result::setNorm(double passedActMult, int normType, int cooltimeType)
 {
 
   actMult = passedActMult;
 
-  switch (normType) {
+  switch (normType) 
+  {
   case OUTNORM_M3:
     metricMult = 1.0/CM3_M3;
     break;
@@ -607,6 +615,7 @@ void Result::setNorm(double passedActMult, int normType)
   default:
     metricMult = 1;
   }
+  cooltime_units = cooltimeType;  
 
 }
 

src/Result.h

@@ -60,6 +60,8 @@ class Result
   /// data is for.
   int kza;
 
+  static int cooltime_units;
+
   /// This is an array of results, one for each cooling time and at
   /// shutdown.
   double *N;
@@ -129,7 +131,9 @@ class Result
 
   /// This function is used to set actMult from the first argument and
   /// metricMult by interpretation of the second argument.
-  static void setNorm(double,int);
+  static void setNorm(double,int,int);
+
+  static int getCooltimeMode();
 
   /// This function is used to set outReminderStr so that each table
   /// makes it clear what is being written.  Corresponding function to query

src/Volume.C

@@ -778,7 +778,7 @@ void Volume::write(int response, int writeComp, CoolingTime* coolList,
   cout << Result::getReminderStr() << endl;
 
   /* write header for totals */
-  coolList->writeTotalHeader("interval");
+  coolList->writeTotalHeader("interval", Result::getCooltimeMode());
 
   /* for each interval */
   while (ptr->next != NULL)