Skip to content

Commit 88868c5

Browse files
boverhofboverhof
authored
Merge pull request #70 from CCSI-Toolset/master
Merge release changes into release 3.3.0
2 parents 6c8a454 + 820457a commit 88868c5

14 files changed

Lines changed: 222 additions & 175 deletions

File tree

‎Master/AspenSinterGUI/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("3.3.0.0")]
55-
[assembly: AssemblyFileVersion("3.3.0.0")]
54+
[assembly: AssemblyVersion("3.3.0.2")]
55+
[assembly: AssemblyFileVersion("3.3.0.2")]

‎Master/AspenSinterGUI/SplashWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</TableCell>
4949
<TableCell>
5050
<Paragraph>
51-
3.1.0
51+
3.3.0.2
5252
</Paragraph>
5353
</TableCell>
5454
</TableRow>

‎Master/CSVConsoleSinter/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.3.0.0")]
36-
[assembly: AssemblyFileVersion("3.3.0.0")]
35+
[assembly: AssemblyVersion("3.3.0.2")]
36+
[assembly: AssemblyFileVersion("3.3.0.2")]

‎Master/CSVFileRW/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.3.0.0")]
36-
[assembly: AssemblyFileVersion("3.3.0.0")]
35+
[assembly: AssemblyVersion("3.3.0.2")]
36+
[assembly: AssemblyFileVersion("3.3.0.2")]

‎Master/ConsoleSinter/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.3.0.0")]
36-
[assembly: AssemblyFileVersion("3.3.0.0")]
35+
[assembly: AssemblyVersion("3.3.0.2")]
36+
[assembly: AssemblyFileVersion("3.3.0.2")]

‎Master/DataGrid2DLibrary/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("3.3.0.0")]
55-
[assembly: AssemblyFileVersion("3.3.0.0")]
54+
[assembly: AssemblyVersion("3.3.0.2")]
55+
[assembly: AssemblyFileVersion("3.3.0.2")]

‎Master/DefaultBuilder/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.3.0.0")]
36-
[assembly: AssemblyFileVersion("3.3.0.0")]
35+
[assembly: AssemblyVersion("3.3.0.2")]
36+
[assembly: AssemblyFileVersion("3.3.0.2")]

‎Master/Sinter/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.3.0.0")]
36-
[assembly: AssemblyFileVersion("3.3.0.0")]
35+
[assembly: AssemblyVersion("3.3.0.2")]
36+
[assembly: AssemblyFileVersion("3.3.0.2")]

‎Master/Sinter/sinter_SimACM.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,7 @@ private sinter.sinter_AppError runSim_SteadyState(bool opt=false)
14391439
{
14401440

14411441
initializeMessageLogging();
1442-
1442+
Log.Information("sinter.sinter_SimACM: runSim_SteadyState");
14431443

14441444
// this ACM module is for steady state, and steady state
14451445
// optimization runs
@@ -1597,7 +1597,7 @@ private sinter.sinter_AppError runSim_Dynamic()
15971597
// this ACM module is for steady state runs
15981598
o_acm.Simulation.RunMode = "Dynamic";
15991599
o_acm.Simulation.Termination = "AtTime";
1600-
1600+
Log.Information("sinter.sinter_SimACM: runSim_Dynamic");
16011601
//If the sim has already been canceled, don't run it.
16021602
lock ((this))
16031603
{
@@ -1762,6 +1762,7 @@ private sinter.sinter_AppError runSim_Dynamic()
17621762

17631763
public override sinter.sinter_AppError runSim()
17641764
{
1765+
Log.Information("sinter.sinter_SimACM: runSim");
17651766
if (simulatorStatus != sinter_simulatorStatus.si_OPEN)
17661767
{
17671768
throw new ArgumentException("Simulator is not in Open status, cannon run!");
@@ -1916,6 +1917,7 @@ private void openDocument()
19161917

19171918
public override void openSim()
19181919
{
1920+
Log.Information("sinter.sinter_SimACM: openSim");
19191921
if (simulatorStatus != sinter_simulatorStatus.si_CLOSED)
19201922
{
19211923
return; //Nothing to do.
@@ -2004,6 +2006,7 @@ public override void openSim()
20042006

20052007
public override void closeSim()
20062008
{
2009+
Log.Information("sinter.sinter_SimACM: closeSim");
20072010
if (simulatorStatus == sinter_simulatorStatus.si_OPEN)
20082011
{
20092012
try
@@ -2029,6 +2032,7 @@ public override void closeSim()
20292032

20302033
public override void stopSim()
20312034
{
2035+
Log.Information("sinter.sinter_SimACM: stopSim");
20322036
lock ((this))
20332037
{
20342038
if (simulatorStatus == sinter_simulatorStatus.si_INITIALIZING)
@@ -2047,6 +2051,7 @@ public override void stopSim()
20472051
public override bool terminate()
20482052
{
20492053
Debug.WriteLine(String.Format("Terminate ProcessId '{0}'", processID), GetType().Name);
2054+
Log.Information(String.Format("sinter.sinter_SimACM: terminate ProcessId='{0}'", processID));
20502055
lock (this)
20512056
{
20522057
if (processID > 0)

‎Master/Sinter/sinter_SimAspen.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,17 +1001,19 @@ public override sinter.sinter_AppError runSim()
10011001
Log.Information("sinter.sinter_SimAspen.runSim: Starting");
10021002
if (simulatorStatus != sinter_simulatorStatus.si_OPEN)
10031003
{
1004+
Log.Information("sinter.sinter_SimAspen.runSim: Simulator is not in Open status");
10041005
throw new ArgumentException("Simulator is not in Open status, cannon run!");
10051006
}
10061007

1007-
1008+
Log.Information("sinter.sinter_SimAspen.runSim: Simulator is in Open status");
10081009
bool exp_report = false;
10091010
sinter_AppError sCheck = sinter_AppError.si_OKAY;
10101011
sinter_AppError bCheck = sinter_AppError.si_OKAY;
10111012
sinter_AppError cCheck = sinter_AppError.si_OKAY;
10121013

10131014
try
10141015
{
1016+
Log.Information("sinter.sinter_SimAspen: runSim check si_RUNNING ");
10151017
simulatorStatus = sinter_simulatorStatus.si_RUNNING;
10161018
Log.Information("sinter.sinter_SimAspen: runSim sendInputsToSim");
10171019
sendInputsToSim();

0 commit comments

Comments
 (0)