Skip to content

Auto GitFlow - develop → MAPL-v3 - Updates to fix issue#381: LFO LDAS output breaking the tag #388

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

Merged
mathomp4 merged 3 commits into from
Jun 27, 2025
Merged

Auto GitFlow - develop → MAPL-v3 - Updates to fix issue#381: LFO LDAS output breaking the tag #388

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
bb875b9
Updates to fix issue#381: LFO LDAS output breaking the tag
gmao-jstassi Jun 18, 2025
cef9c83
Merge branch 'develop' into bugfix/jstassi/#381/handling_LFO_LDAS
rtodling Jun 26, 2025
51ea00d
Merge pull request #385 from GEOS-ESM/bugfix/jstassi/#381/handling_LF…
rtodling Jun 26, 2025
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
4 changes: 3 additions & 1 deletion src/Applications/GEOSdas_App/AGCMrc.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ my %list = (rs5_core => \@rs5_core,
@rs5_others = qw ( ana_satbang_rst
ana_satbias_rst
ana_satbiaspc_rst
bkg.lfo_inst
bkg.lfo_tavg
bkg03_eta_rst
bkg03_sfc_rst
bkg06_eta_rst
Expand Down Expand Up @@ -412,7 +414,7 @@ sub outputAGCM {
if ( $comment{"$key"} ) {$rcd = "\#".$rcd};
}
}
# uncomment specified lines if key is in first non-blank position
# uncomment specified lines if '#' is in first non-blank position
#----------------------------------------------------------------
foreach $key ( keys %uncomment ) {
$key =~ s/^\#//; # no longer need '#' in front of key
Expand Down
1 change: 1 addition & 0 deletions src/Applications/GEOSdas_App/edhist.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,7 @@ sub write_silo_mstorage_arc {
print MSTORE $label;

foreach $name (@topList) {
next if $name =~ m/^bkg.lfo_/;
$silo = $cdef{"$name.silo.N1"};
$template = $cdef{"$name.template.N1"};
if ($fcstFLG and $template =~ m/^(.+)\.(.+)$/) {
Expand Down
26 changes: 10 additions & 16 deletions src/Applications/GEOSdas_App/gen_silo_arc.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ sub history_info {
#=======================================================================
sub restart_info {
use AGCMrc qw(AGCM_rsts);
my ($label, $lineB, $lineN, $lineT, $lineTAR, $line);
my ($label, $lineB, $lineN, $lineT, @arrT, $line);
my ($listname, @rsts, $rstL, $rst);

$label = "#\n"
Expand Down Expand Up @@ -213,19 +213,13 @@ sub restart_info {
}
}
printarc("#\n# restart tar file\n#\n");
$lineTAR = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.agcmrst.%y4%m2%d2_%h2z.tar';
printarc("$lineTAR\n");
$lineTAR = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.incrst.%y4%m2%d2_%h2z.tar';
printarc("$lineTAR\n");
$lineTAR = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.rst.%y4%m2%d2_%h2z.tar';
printarc("$lineTAR\n");
$lineTAR = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.bkgcrst.%y4%m2%d2_%h2z.tar';
printarc("$lineTAR\n");
$lineTAR = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.bkglforst.%y4%m2%d2_%h2z.tar';
printarc("$lineTAR\n");
$lineTAR = '${PESTOROOT}%s/jedi/rs/Y%y4/M%m2/%s.jedi_agcmrst.%y4%m2%d2_%h2z.tar';
printarc("$lineTAR\n");

$arrT[0] = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.agcmrst.%y4%m2%d2_%h2z.tar';
$arrT[1] = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.incrst.%y4%m2%d2_%h2z.tar';
$arrT[2] = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.rst.%y4%m2%d2_%h2z.tar';
$arrT[3] = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.bkgcrst.%y4%m2%d2_%h2z.tar';
$arrT[4] = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.bkglforst.%y4%m2%d2_%h2z.tar';
$arrT[5] = '${PESTOROOT}%s/jedi/rs/Y%y4/M%m2/%s.jedi_agcmrst.%y4%m2%d2_%h2z.tar';
for (@arrT) { printarc("$_\n") }
closearc();
}

Expand All @@ -235,8 +229,8 @@ sub restart_info {
#=======================================================================
sub gsiobs_info {
my ($label, $line);
my (@convlist, @satlist, @ozlist, $conv, $sat, $oz, $dline1, $dline2, $dline3, $dline4);
my (%convlist, %satlist, %ozlist);
my ($conv, $sat, $oz, $dline1, $dline2, $dline3, $dline4);
my (@convlist, @satlist, @ozlist, %convlist, %satlist, %ozlist);

$label = "#\n"
. "# --------------------\n"
Expand Down