Merge pull request #385 from GEOS-ESM/bugfix/jstassi/#381/handling_LFO_LDAS

Updates to fix issue#381: LFO LDAS output breaking the tag

Author: rtodling

src/Applications/GEOSdas_App/AGCMrc.pm

@@ -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
@@ -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

src/Applications/GEOSdas_App/edhist.pl

@@ -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/^(.+)\.(.+)$/) {

src/Applications/GEOSdas_App/gen_silo_arc.pl

@@ -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"
@@ -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();
 }
 
@@ -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"