Skip to content

Support 1295 GUI source groups with fixed-width filenames #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Borealis-Thoon wants to merge 3 commits into
base: V2701
Choose a base branch
from
Open

Support 1295 GUI source groups with fixed-width filenames #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7991712
Extend source groups across GUI editing and result evaluation
Borealis-Thoon Sep 14, 2026
3ddb5c1
Retain space-delimited emission summary input
Borealis-Thoon Sep 14, 2026
e2bd9ff
Use Windows-safe two-character tokens for 1295 source groups
Borealis-Thoon Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/GRALBackgroundworkers/Background_Allinout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,21 +210,21 @@ private void OdourAllinAllout(GralBackgroundworkers.BackgroundworkerData mydata,
akmet = text[2];
frequency = Convert.ToDouble(text[3].Replace(".", decsep));
//GRAL filenames
string[] con_files = new string[100];
string[] odr_files = new string[100];
string[] con_files = new string[sg_names.Length];
string[] odr_files = new string[sg_names.Length];
string[] concdata = new string[3];
itm = 0;
foreach (string source_group_name in sg_names)
{
if (sg_names.Length > 0)
{
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itm].PadLeft(2, '0') + ".con";
odr_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itm].PadLeft(2, '0') + ".odr";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".con";
odr_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".odr";
}
else
{
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itm]).PadLeft(2, '0') + ".con";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itm]).PadLeft(2, '0') + ".odr";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itm]) + ".con";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itm]) + ".odr";
}

if (File.Exists(Path.Combine(mydata.ProjectName, @"Computation", con_files[itm])) == false &&
Expand Down
12 changes: 6 additions & 6 deletions src/GRALBackgroundworkers/Background_Compost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,21 @@ private void OdourCompost(GralBackgroundworkers.BackgroundworkerData mydata,
akmet = text[2];
frequency = Convert.ToDouble(text[3].Replace(".", decsep));
//GRAL filenames
string[] con_files = new string[100];
string[] odr_files = new string[100];
string[] con_files = new string[sg_names.Length];
string[] odr_files = new string[sg_names.Length];
string[] concdata = new string[3];
itm = 0;
foreach (string source_group_name in sg_names)
{
if (sg_names.Length > 0)
{
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itm].PadLeft(2, '0') + ".con";
odr_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itm].PadLeft(2, '0') + ".odr";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".con";
odr_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".odr";
}
else
{
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itm]).PadLeft(2, '0') + ".con";
odr_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itm]).PadLeft(2, '0') + ".odr";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itm]) + ".con";
odr_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itm]) + ".odr";
}

if (File.Exists(Path.Combine(mydata.ProjectName, @"Computation", con_files[itm])) == false &&
Expand Down
4 changes: 2 additions & 2 deletions src/GRALBackgroundworkers/Background_EvalTimeSeries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private void GenerateTimeSeries(GralBackgroundworkers.BackgroundworkerData mydat
}
}

string ConFile = Convert.ToString(meteoSit + 1).PadLeft(5, '0') + "-" + Convert.ToString(_slice + 1) + sg_numbers[sgNumber].PadLeft(2, '0') + ".con";
string ConFile = Convert.ToString(meteoSit + 1).PadLeft(5, '0') + "-" + Convert.ToString(_slice + 1) + Gral.SourceGroupFileName.Encode(sg_numbers[sgNumber]) + ".con";
string filename = Path.Combine(mydata.ProjectName, @"Computation", ConFile);
if (ReadConFiles(filename, mydata, sgNumber, ref conc))
{
Expand Down Expand Up @@ -319,7 +319,7 @@ private void GenerateTimeSeries(GralBackgroundworkers.BackgroundworkerData mydat
}

SourceGroupNumbers[itm] = GetSgNumbers(sourceGroupName);
string newpath = Path.Combine(ModulationPath, "emissions" + SourceGroupNumbers[itm].PadLeft(3, '0') + ".dat");
string newpath = Path.Combine(ModulationPath, "emissions" + Gral.SourceGroupFileName.ModulationToken(SourceGroupNumbers[itm]) + ".dat");

if (File.Exists(newpath))
{
Expand Down
6 changes: 3 additions & 3 deletions src/GRALBackgroundworkers/Background_HighPercentiles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ private void HighPercentiles(GralBackgroundworkers.BackgroundworkerData mydata,
{
//GRAL filenames
bool exist = true;
string[] con_files = new string[100];
string[] con_files = new string[sg_names.Length];

//get correct weather number in dependence on steady-state or transient simulation
int weanumb = n;
Expand Down Expand Up @@ -311,11 +311,11 @@ private void HighPercentiles(GralBackgroundworkers.BackgroundworkerData mydata,
{
if (sg_names.Length > 0) // counts the number of elements in sg_names >0
{
con_files[itm] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itm].PadLeft(2, '0') + ".con";
con_files[itm] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".con";
}
else
{
con_files[itm] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_numbers[itm]).PadLeft(2, '0') + ".con";
con_files[itm] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".con";
}

if (File.Exists(Path.Combine(mydata.ProjectName, @"Computation", con_files[itm])) == false &&
Expand Down
12 changes: 6 additions & 6 deletions src/GRALBackgroundworkers/Background_Mean.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,20 +179,20 @@ private void Mean(GralBackgroundworkers.BackgroundworkerData mydata,
frequency = Convert.ToDouble(text[3].Replace(".", decsep));

//GRAL filenames
string[] con_files = new string[100];
string[] dep_files = new string[100];
string[] con_files = new string[sg_names.Length];
string[] dep_files = new string[sg_names.Length];
itm = 0;
foreach (string source_group_name in sg_names)
{
if (sg_names.Length > 0)
{
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itm].PadLeft(2, '0') + ".con";
dep_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + sg_numbers[itm].PadLeft(2, '0') + ".dep";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".con";
dep_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Gral.SourceGroupFileName.Encode(sg_numbers[itm]) + ".dep";
}
else
{
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itm]).PadLeft(2, '0') + ".con";
dep_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(sg_names[itm]).PadLeft(2, '0') + ".dep";
con_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itm]) + ".con";
dep_files[itm] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Gral.SourceGroupFileName.Encode(sg_names[itm]) + ".dep";
}

if (File.Exists(Path.Combine(mydata.ProjectName, @"Computation", dep_files[itm])) == false &&
Expand Down
12 changes: 6 additions & 6 deletions src/GRALBackgroundworkers/Background_MeanMaxDaymax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ private void MeanMaxDaymax(GralBackgroundworkers.BackgroundworkerData mydata,
{
//GRAL filenames
exist = true;
string[] con_files = new string[100];
string[] con_files = new string[sg_names.Length];
existdep = true;
string[] dep_files = new string[100];
string[] dep_files = new string[sg_names.Length];

//get correct weather number in dependence on steady-state or transient simulation
int weanumb = n;
Expand All @@ -255,13 +255,13 @@ private void MeanMaxDaymax(GralBackgroundworkers.BackgroundworkerData mydata,

if (sg_names.Length > 0)
{
con_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itmp].PadLeft(2, '0') + ".con";
dep_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + sg_numbers[itmp].PadLeft(2, '0') + ".dep";
con_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".con";
dep_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".dep";
}
else
{
con_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_numbers[itmp]).PadLeft(2, '0') + ".con";
dep_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(sg_numbers[itmp]).PadLeft(2, '0') + ".dep";
con_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".con";
dep_files[itmp] = Convert.ToString(weanumb + 1).PadLeft(5, '0') + "-" + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".dep";
}

if (File.Exists(Path.Combine(mydata.ProjectName, @"Computation", dep_files[itmp])) == false &&
Expand Down
12 changes: 6 additions & 6 deletions src/GRALBackgroundworkers/Background_OdourHours.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ private void OdourHours(GralBackgroundworkers.BackgroundworkerData mydata,
akmet = text[2];
frequency = Convert.ToDouble(text[3].Replace(".", decsep));
//GRAL filenames
string[] con_files = new string[100];
string[] odr_files = new string[100];
string[] con_files = new string[sg_names.Length];
string[] odr_files = new string[sg_names.Length];

//itm=0;
//foreach (string source_group_name in sg_names)
Expand All @@ -200,13 +200,13 @@ private void OdourHours(GralBackgroundworkers.BackgroundworkerData mydata,
bool parallel_existconp = false;
if (sg_names.Length > 0)
{
con_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itmp].PadLeft(2, '0') + ".con";
odr_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itmp].PadLeft(2, '0') + ".odr";
con_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".con";
odr_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".odr";
}
else
{
con_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itmp]).PadLeft(2, '0') + ".con";
odr_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itmp]).PadLeft(2, '0') + ".odr";
con_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itmp]) + ".con";
odr_files[itmp] = Convert.ToString(wl).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itmp]) + ".odr";
}

if (File.Exists(Path.Combine(mydata.ProjectName, @"Computation", con_files[itmp])) == false &&
Expand Down
12 changes: 6 additions & 6 deletions src/GRALBackgroundworkers/Background_OdourHoursTransient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,22 +160,22 @@ private void OdourHoursTransient(GralBackgroundworkers.BackgroundworkerData myda
RestoreJaggedArray(concm);

//GRAL filenames
string[] con_files = new string[100];
string[] odr_files = new string[100];
string[] con_files = new string[sg_names.Length];
string[] odr_files = new string[sg_names.Length];

Object thisLock = new Object();
Parallel.For(0, sg_names.Length, itmp =>
{
bool parallel_existconp = false;
if (sg_names.Length > 0)
{
con_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itmp].PadLeft(2, '0') + ".con";
odr_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + sg_numbers[itmp].PadLeft(2, '0') + ".odr";
con_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".con";
odr_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_numbers[itmp]) + ".odr";
}
else
{
con_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itmp]).PadLeft(2, '0') + ".con";
odr_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Convert.ToString(sg_names[itmp]).PadLeft(2, '0') + ".odr";
con_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itmp]) + ".con";
odr_files[itmp] = Convert.ToString(i + 1).PadLeft(5, '0') + "-" + Convert.ToString(mydata.Slice) + Gral.SourceGroupFileName.Encode(sg_names[itmp]) + ".odr";
}

if (File.Exists(Path.Combine(mydata.ProjectName, @"Computation", con_files[itmp])) == false &&
Expand Down
Loading