Add option to convert cooling times in output file to seconds by anu1217 · Pull Request #148 · svalinn/ALARA

anu1217 · 2025-11-06T15:48:52Z

This PR introduces changes that allow the user to select the units (default or seconds) in which cooling times are printed in the headers of the output tables, if the units keyword is added in the output section of the input file.

Adding this in as a draft for now as this change has had many moving pieces, with changes to function definitions in multiple files, and I anticipate more work being necessary for everything to work as intended.

fixes #137

gonuke · 2025-12-29T19:45:14Z

There is a merge conflict to be resolved here thanks to #215

anu1217 · 2025-12-31T13:51:09Z

I've pulled from this branch and tested out these changes, and they appear to be working as expected. Some documentation changes are likely still needed.

gonuke

I'm a little surprised that this compiles, given some mismatches in the header and code.

src/Loading.C

src/Mixture.C

src/CoolingTime.C

src/OutputFormat.C

gonuke · 2026-01-03T19:04:02Z

src/OutputFormat.C

I think we need to write the cooling time units for these ones, too, probably

Should print out the units for the other responses now

src/Volume.C

src/Result.C

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>

anu1217 · 2026-01-07T20:48:46Z

Before marking this as ready for review, I changed my approach to this problem and pushed all my changes to a different branch, before merging the new branch into this one. I believe this didn't execute the way I expected and left some extraneous changes, which I think have all been resolved now.

gonuke

Sorry - this review was 1/2 done a while ago and got lost...

src/CoolingTime.h

gonuke · 2026-01-10T16:02:09Z

src/CoolingTime.C

+      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);
+      }


Maybe a short function

std::string coolingTimeStr(int coolTimeUnit)

That does this to ensure consistency across different places we do this (currently only two)

gonuke · 2026-01-22T18:21:08Z

src/Result.C

-    metricMult = 1;
-  }
+    cooltime_units = cooltimeType;
+  }   


I'm not sure this is right...

Don't we still want to make sure metricMult is set correctly in the default case? An don't we want to update cooltime_units regardless of the value of normType?

I think I may have deleted too many lines after getting rid of a switch statement for cooltimeType...

gonuke · 2026-01-22T18:24:27Z

src/OutputFormat.C

+	  input >> token;
+	  next->cooltimeUnits = new char[strlen(token)+2];


For better or worse, this is not backwards compatible and will make old input files fail. We should discuss how important that is...

This should be backwards compatible now

src/OutputFormat.C

correctly set metric multiplier and cooltime units remove unused break address feedback

add std namespace avoid crossing initialization move initialization of pos declare pos in block remove extra space reinitialize cooltimeUnits so that there is no extra space initialize cooltimeUnits with the length of the units token account for nonexisting cooling time units check condition with first character of token

Address feedback and test some changes

anu1217

I've addressed most of the feedback here and have tested these changes in a container.

anu1217 · 2026-02-24T20:20:00Z

src/Result.C

-    metricMult = 1;
-  }
+    cooltime_units = cooltimeType;
+  }   


I think I may have deleted too many lines after getting rid of a switch statement for cooltimeType...

anu1217 · 2026-02-24T22:47:28Z

src/OutputFormat.C

+	  input >> token;
+	  next->cooltimeUnits = new char[strlen(token)+2];


This should be backwards compatible now

gonuke

Sorry for the delay - I had some pending changes that I forgot to submit.

gonuke · 2026-02-25T12:24:39Z

src/OutputFormat.C

      switch (1<<type)
 	{
 	case OUTFMT_UNITS:
+	  {	


Do we need these braces?

gonuke · 2026-02-25T12:27:24Z

src/OutputFormat.C

-	  break;
+
+	  delete[] next->cooltimeUnits;
+	  next->cooltimeUnits = new char[strlen(token)+1];


I'm not sure this is the right token to use to determine the length?

gonuke · 2026-02-25T12:28:35Z

src/OutputFormat.C

+			}
+		else if (tolower(token[0]) == 'd')
+			{
+			input.seekg(pos);


What is this doing? Can't you just do nothing in this case?

gonuke · 2026-03-03T23:06:42Z

src/OutputFormat.C

-	  break;
+
+	  delete[] next->cooltimeUnits;
+	  next->cooltimeUnits = new char[strlen(token)+1];


For better or worse, this is not backwards compatible and will make old input files fail. We should discuss how important that is...

Perhaps we figure out a way to make it optional?

gonuke · 2026-03-03T23:14:03Z

src/OutputFormat.C

+	  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);		
+			}
+		}


Why might need to implement clang-formatting next, but this style is preferred:

Suggested change

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);

}

}

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);

}

}

gonuke · 2026-03-03T23:16:33Z

src/Result.C

+  switch (normType) 
+  {


Suggested change

switch (normType)

{

switch (normType) {

gonuke added this to the ALARA postprocessing tools milestone Nov 24, 2025

gonuke assigned anu1217 Nov 24, 2025

anu1217 added 2 commits December 22, 2025 10:36

add cooling time variables

1df072d

add cooling time integers

81d5d7f

anu1217 added 14 commits December 30, 2025 14:34

add Output_def.h to CoolingTime.h

a53e8ea

add cooltime_units as argument to writeTotalHeader()

55c8258

add condition to convert units for total header

bb93e50

add cooltimeUnits

a7228d1

add cooltimeType as argument to setNorm()

9b4edba

add cooltime_units to Result

9370056

add missing ;

182e487

turn getCooltimeMode into a static function

266d1f4

change name of returned object

5994579

reflect getCooltimeMode being changed to static

4bc23ae

only declare function in Result.h

b142877

add logic to writeHeader()

bbc962a

fix arguments for writeHeader()

ef89289

fix logic

8fec07e

anu1217 marked this pull request as ready for review December 31, 2025 13:51

gonuke requested changes Jan 3, 2026

View reviewed changes

anu1217 force-pushed the output_s branch 4 times, most recently from 85748c1 to 81d5d7f Compare January 7, 2026 17:34

anu1217 and others added 4 commits January 7, 2026 11:44

Apply suggestion from @gonuke

6eba7c6

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>

Apply suggestion from @gonuke

3d950f2

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>

Apply suggestion from @gonuke

20dab87

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>

Merge branch 'main' into output_s

717b0e5

anu1217 and others added 7 commits January 7, 2026 11:56

Merge branch 'svalinn:main' into output_s

598b1fb

Merge branch 'output_s' of github.com:anu1217/ALARA into output_s

cce2f7e

add missing curly braces

582f8b0

add condition to ensure cooltime units are printed to top header

32fea30

redefine char

5da0c69

remove conditional statement

ba06de0

remove commented lines

73212f2

add cooltimeUnits to other responses

257c8d8

gonuke requested changes Jan 22, 2026

View reviewed changes

anu1217 and others added 3 commits February 24, 2026 14:24

remove unused header

31d3c5e

correctly set metric multiplier and cooltime units remove unused break address feedback

Merge pull request #6 from anu1217/test_output_s

d75be17

Address feedback and test some changes

anu1217 commented Feb 24, 2026

View reviewed changes

gonuke requested changes Mar 3, 2026

View reviewed changes

		input >> token;
		next->cooltimeUnits = new char[strlen(token)+2];

Conversation

anu1217 commented Nov 6, 2025

Uh oh!

gonuke commented Dec 29, 2025

Uh oh!

anu1217 commented Dec 31, 2025

Uh oh!

gonuke left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anu1217 commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gonuke left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

anu1217 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gonuke left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

anu1217 commented Jan 7, 2026 •

edited

Loading