ECC-1903: Fixed some bugs and commented the code.

This commit is contained in:
Matthew Griffith 2024-09-27 15:54:10 +00:00
parent 6412e3203b
commit acccbbeec8
2 changed files with 40 additions and 14 deletions

View File

@ -3,11 +3,29 @@
constant tablesVersionMTG2Switch=33: hidden;
# MTG2
# MTG2 behaviour based on tablesVersion above
# 0 = pre-MTG2 encoding used
# 1 = post-MTG2 encoding used
# 2 = post-MTG2 encoding with paramId + chemId used
if (tablesVersion <= tablesVersionMTG2Switch) {
# Pre-MTG2
constant MTG2SwitchDefault = 0;
} else {
constant MTG2SwitchDefault = 1;
# For class mc and cr post MTG2 we always want the param + chem split (value 2)
# For TIGGE, marsClass is not defined in the empty local Section 2, but is defined later on.
# Therefore we need to protect this with an if defined check
if (defined(marsClass) and (marsClass is 'mc' or marsClass is 'cr')) {
constant MTG2SwitchDefault = 2;
# All other cases we are post-MTG2
} else {
constant MTG2SwitchDefault = 1;
}
}
concept MTG2Switch(MTG2SwitchDefault, "MTG2SwitchConcept.def", conceptsDir2,conceptsDir1): no_copy, read_only;

View File

@ -2,24 +2,32 @@
# 0 = pre-MTG2 encoding used
# 1 = post-MTG2 encoding used
# 2 = post-MTG2 encoding with paramId + chemId used
# Model version cannot be used in this concept because its concept is only evaluated at the end of Section 4,
# and in many cases we use the value of the MTG2Switch earlier. Therefore we must use the backgroundProcess
# and generatingProcessIdentifier key directly. The values for IFS are:
# backgroundProcess=255
# 'cy50r2' = { generatingProcessIdentifier = 161; }
# 'cy50r1' = { generatingProcessIdentifier = 160; }
# 'cy49r2' = { generatingProcessIdentifier = 159; }
# 'cy49r1' = { generatingProcessIdentifier = 158; }
# OD
0 = {tablesVersion=35; productionStatusOfProcessedData=0; modelVersion='cy50r1';}
1 = {tablesVersion=35; productionStatusOfProcessedData=1; modelVersion='cy50r1';}
1 = {tablesVersion=35; productionStatusOfProcessedData=0; modelVersion='cy50r2';}
0 = {tablesVersion=35; productionStatusOfProcessedData=0; backgroundProcess=255; generatingProcessIdentifier=160;}
1 = {tablesVersion=35; productionStatusOfProcessedData=1; backgroundProcess=255; generatingProcessIdentifier=160;}
1 = {tablesVersion=35; productionStatusOfProcessedData=0; backgroundProcess=255; generatingProcessIdentifier=161;}
# MC
2 = {tablesVersion=35; productionStatusOfProcessedData=1; modelVersion='cy50r1'; marsClass='mc';}
2 = {tablesVersion=35; productionStatusOfProcessedData=0; modelVersion='cy50r2'; marsClass='mc';}
2 = {tablesVersion=35; productionStatusOfProcessedData=1; backgroundProcess=255; generatingProcessIdentifier=160; marsClass='mc';}
2 = {tablesVersion=35; productionStatusOfProcessedData=0; backgroundProcess=255; generatingProcessIdentifier=161; marsClass='mc';}
# RD
0 = {tablesVersion=35; productionStatusOfProcessedData=2; modelVersion='cy50r1';}
# 1 = {tablesVersion=35; productionStatusOfProcessedData=2; modelVersion='cy50r1'; typeOfProcessedData=9;}
1 = {tablesVersion=35; productionStatusOfProcessedData=2; modelVersion='cy50r2';}
0 = {tablesVersion=35; productionStatusOfProcessedData=2; backgroundProcess=255; generatingProcessIdentifier=160;}
1 = {tablesVersion=35; productionStatusOfProcessedData=2; backgroundProcess=255; generatingProcessIdentifier=161;}
# SEAS6
1 = {tablesVersion=34; productionStatusOfProcessedData=0; modelVersion='cy49r2';}
1 = {tablesVersion=34; productionStatusOfProcessedData=0; backgroundProcess=255; generatingProcessIdentifier = 159;}
# ERA6
1 = {tablesVersion=34; productionStatusOfProcessedData=3; modelVersion='cy49r2'; marsClass='e6';}
1 = {tablesVersion=34; productionStatusOfProcessedData=3; backgroundProcess=255; generatingProcessIdentifier = 159; marsClass='e6';}
# EAC5
2 = {tablesVersion=34; productionStatusOfProcessedData=3; modelVersion='cy49r2'; marsClass='mc';}
2 = {tablesVersion=34; productionStatusOfProcessedData=3; modelVersion='cy49r2'; marsClass='cr';}
2 = {tablesVersion=34; productionStatusOfProcessedData=3; backgroundProcess=255; generatingProcessIdentifier=159; marsClass='mc';}
2 = {tablesVersion=34; productionStatusOfProcessedData=3; backgroundProcess=255; generatingProcessIdentifier=159; marsClass='cr';}