1st submit of changes to mars.step for processed ranges

This commit is contained in:
Robert Osinski 2024-09-26 13:57:29 +00:00
parent 7dfb006194
commit bf7a0c2d86
19 changed files with 64 additions and 19 deletions

View File

@ -128,6 +128,14 @@ if (paramId >= 140000 && paramId < 141000 &&
}
template timeproc "grib2/timeproc.def";
alias mars.timeproc = timeproc ;
#alias mars.timeproc = timeproc ;
if ( timeproc is "unknown" || timeproc is "point-in-time" || timeproc is "none"){
# transient timeproc_alias = timeproc ;
transient timeprocendstep = endStep;
#meta timeprocendstep sprintf("%s(%d)",timeproc,endStep);
} else {
#transient timeprocendstep = endStep;
meta timeprocendstep sprintf("%s(%d)",timeproc,endStep);
}
meta md5Section4 md5(offsetSection4,section4Length);

View File

@ -1,4 +1,5 @@
concept timeproc {
"unknown" = { dummy = 1; }
# either instantaneous data or processing is specified by mars stream
"point-in-time" = {stepType="instant";}
"point-in-time" = {stream="swmm"; numberOfTimeRange=1;}

View File

@ -20,7 +20,9 @@ alias monthlyVerificationTime = validityTime;
if (class is "em" || class is "e2" || class is "ea" || class is "ep" ||
class is "rd" || class is "mc" || class is "et" || class is "l5")
{
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}
else
{

View File

@ -1,4 +1,6 @@
# class e4
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.number=perturbationNumber;

View File

@ -2,7 +2,9 @@
meta verificationDate g1verificationdate(dataDate, dataTime, endStep) : read_only;
meta monthlyVerificationDate g1monthlydate(verificationDate) : dump,no_copy;
alias mars.date = monthlyVerificationDate;
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
meta verificationYear evaluate(verificationDate/10000);
meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);

View File

@ -2,7 +2,9 @@
meta verificationDate g1verificationdate(dataDate, dataTime, startStep) : read_only;
alias mars.date = verificationDate;
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
# Only ERA15 has time and step
if(class != 3) {

View File

@ -4,7 +4,9 @@
if(startStep == endStep)
{
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}
else
{
@ -12,7 +14,9 @@ else
{
if(startStep == endStep - 24)
{
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}
else
{

View File

@ -1,2 +1,4 @@
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.number = perturbationNumber;

View File

@ -1,7 +1,9 @@
# EFAS Fill-up
# ECC-701
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.date = dateOfForecast;
alias mars.time = timeOfForecast;

View File

@ -1,7 +1,9 @@
# EFAS Gridded observations
# ECC-701
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.date = dateOfForecast;
alias mars.time = timeOfForecast;

View File

@ -2,7 +2,9 @@
# Water Balance
# ECC-701
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.date = dateOfForecast;
alias mars.time = timeOfForecast;

View File

@ -1,7 +1,9 @@
# EFAS climatology Gridded observations
# ECC-701
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.date = dateOfModelVersion;
alias mars.time = dataTime;

View File

@ -2,7 +2,9 @@
# Water Balance
# ECC-701
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.date = dateOfModelVersion;
alias mars.time = dataTime;

View File

@ -5,6 +5,8 @@
if(startStep == endStep)
{
alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}
else
{
@ -13,7 +15,8 @@ else
if(startStep == endStep - 24)
{
alias mars.step = endStep;
}
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval; }
else
{
transient patch_precip_fp = 24;

View File

@ -1,2 +1,4 @@
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
alias mars.number = perturbationNumber;

View File

@ -16,7 +16,9 @@ alias monthlyVerificationTime = validityTime;
if (class is "em" || class is "e2" || class is "ea" || class is "ep" ||
class is "rd" || class is "mc" || class is "et" || class is "l5")
{
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}
else
{

View File

@ -15,7 +15,9 @@ alias monthlyVerificationTime = validityTime;
if (class is "em" || class is "e2" || class is "ea" || class is "ep" ||
class is "rd" || class is "mc" || class is "et" || class is "l5")
{
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}
else
{

View File

@ -1,5 +1,6 @@
if (levtype is "o2d" || levtype is "o3d") {
alias mars.step = stepRange;
} else {
alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}

View File

@ -1,7 +1,9 @@
if (levtype is "o2d" || levtype is "o3d") {
alias mars.step = stepRange;
} else {
alias mars.step = endStep;
#alias mars.step = endStep;
meta stepInterval sprintf("%s",timeprocendstep);
alias mars.step = stepInterval;
}
alias mars.number = perturbationNumber;