Orbit params and others

components.yaml

@@ -28,7 +28,7 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: rt1_4_10_geosit5
+  tag: rt1_4_10_geosit6
   develop: main
 
 MAPL:
@@ -46,7 +46,7 @@ FMS:
 GEOSana_GridComp:
   local: ./src/Components/@GEOSana_GridComp
   remote: ../GEOSana_GridComp.git
-  tag: v1.5.4.4
+  tag: v1.5.4.6
   develop: develop
 
 GEOSgcm_GridComp:
@@ -101,7 +101,7 @@ geos-chem:
 GOCART:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART
   remote: ../GOCART.git
-  tag: rt1.0.1_geosit3
+  tag: rt1.0.1_geosit4
   sparse: ./config/GOCART.sparse
   develop: develop
 
@@ -121,7 +121,7 @@ mom6:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: rt1.5.6_geosit_hist5
+  tag: rt1.5.6_orbParam
   develop: develop
 
 UMD_Etc:

src/Applications/GEOSdas_App/GEOSdas.csm

@@ -5953,10 +5953,10 @@ endif
        /bin/rm $EXPID.*rst*iter*.$RSTSUFFIX
     endif
     cd -
-    set lsttrajrst = `ls $EXPID.traj_lcv_rst.*$NCSUFFIX`
-    if ( ${%lsttrajrst}  ) then
-       tar cvf $FVWORK/$EXPID.trajrst.${rtag3}.tar $lsttrajrst
-       /bin/rm $lsttrajrst
+    set lstbkgcrst = `ls $EXPID.bkg_clcv_rst.*$NCSUFFIX`
+    if ( ${%lstbkgcrst}  ) then
+       tar cvf $FVWORK/$EXPID.bkgcrst.${rtag3}.tar $lstbkgcrst
+       /bin/rm $lstbkgcrst
     endif
     if ( $DO4DIAU ) then
        set lstagcmrst = `ls $EXPID.agcm_import_rst.*$NCSUFFIX`

src/Applications/GEOSdas_App/edhist.pl

@@ -1377,7 +1377,7 @@ sub add_silo_mstorage_traits {
     #------------------------------
   outer: foreach $name (@bottomList) {
 
-      next outer if $name =~ m/_rst/ and $name ne "traj_lcv_rst";
+      next outer if $name =~ m/_rst/ and $name ne "bkg_clcv_rst";
       unless ($traitHash{$name} =~ m/\bsilo\b/) {
           $traitHash{$name} =~ s/:template:/:template:silo.N1:/;
 

src/Applications/GEOSdas_App/fvsetup

@@ -1359,6 +1359,8 @@ sub ed_g5hist_rc_new {
         .       " -s \@COMPRESS=$cmprss"
         .       " -s \@APERT_IM=$apert_im"
         .       " -s \@APERT_JM=$apert_jm"
+        .       " -s \@BJEDI_IM=$bjedi_im"
+        .       " -s \@BJEDI_JM=$bjedi_jm"
         .       " -s \@PERT_FREQ=$pert_freq"
         .       " -s \@AGCM_GRIDNAME=$AGCM_GRIDNAME";
     print "$cmd\n";
@@ -1453,6 +1455,8 @@ sub ed_g5prog_rc {
     if($rcd =~ /\@HIST_PERT_JM/)   { $rcd=~ s/\@HIST_PERT_JM/$hist_pert_jm/ }
     if($rcd =~ /\@APERT_IM/)       { $rcd=~ s/\@APERT_IM/$apert_im/ }
     if($rcd =~ /\@APERT_JM/)       { $rcd=~ s/\@APERT_JM/$apert_jm/ }
+    if($rcd =~ /\@BJEDI_IM/)       { $rcd=~ s/\@BJEDI_IM/$bjedi_im/ }
+    if($rcd =~ /\@BJEDI_JM/)       { $rcd=~ s/\@BJEDI_JM/$bjedi_jm/ }
     if($rcd =~ /\@PERT_FREQ/)      { $rcd=~ s/\@PERT_FREQ/$pert_freq/ }
     if($rcd =~ /\@FCSENS/) {
         if ($admtlm) { $rcd =~ s/\@FCSENS/ /; }
@@ -1526,6 +1530,8 @@ sub ed_g5prog_rc_new {
         .                 " -s \@HIST_PERT_JM=$hist_pert_jm"
         .                 " -s \@APERT_IM=$apert_im"
         .                 " -s \@APERT_JM=$apert_jm"
+        .                 " -s \@BJEDI_IM=$bjedi_im"
+        .                 " -s \@BJEDI_JM=$bjedi_jm"
         .                 " -s \@PERT_FREQ=$pert_freq"
         .                 " -s \@AGCM_GRIDNAME=$AGCM_GRIDNAME";
     print "$cmd\n";
@@ -1915,6 +1921,8 @@ sub ed_gsigridcomp_rc {
            if($rcd =~ /\@NYGSI/) {$rcd=~ s/\@NYGSI/$nygsi/g; }
            if($rcd =~ /\@APERT_IM/) {$rcd=~ s/\@APERT_IM/$apert_im/g; }
            if($rcd =~ /\@APERT_JM/) {$rcd=~ s/\@APERT_JM/$apert_jm/g; }
+           if($rcd =~ /\@BJEDI_IM/) {$rcd=~ s/\@BJEDI_IM/$apert_im/g; }
+           if($rcd =~ /\@BJEDI_JM/) {$rcd=~ s/\@BJEDI_JM/$apert_jm/g; }
        }
        if($rcd =~ /\@NSIG/) {$rcd=~ s/\@NSIG/$siglevs/g; }
        if($rcd =~ /\@VARWINDOW/) {$rcd=~ s/\@VARWINDOW/$varwnd_nhms/g; }
@@ -4761,6 +4769,8 @@ EOF
        $hist_pert_jm = $agcm_jm;
        $apert_im = $ana_im;
        $apert_jm = $ana_jm;
+       $bjedi_im = $ana_im;
+       $bjedi_jm = $ana_jm;
        $anahgrd = substr($res,0,1);
        $jcap_ens = $jcap;
        $ana_im_ens = $ana_im;
@@ -4790,6 +4800,8 @@ EOF
        $hist_pert_jm = $agcm_jm;
        $apert_im = $agcm_im;
        $apert_jm = $agcm_jm;
+       $bjedi_im = $agcm_im;
+       $bjedi_jm = $agcm_jm;
        $anahgrd = substr($res,0,1);
        $jcap_ens = $jcap;
        $ana_im_ens = $ana_im;
@@ -4819,6 +4831,8 @@ EOF
        $hist_pert_jm = $agcm_jm;
        $apert_im = $agcm_im;
        $apert_jm = $agcm_jm;
+       $bjedi_im = $agcm_im;
+       $bjedi_jm = $agcm_jm;
        $anahgrd = substr($res,0,1);
        $jcap_ens = $jcap;
        $ana_im_ens = $ana_im;
@@ -4846,6 +4860,8 @@ EOF
        $hist_pert_jm = $agcm_jm;
        $apert_im = $agcm_im;
        $apert_jm = $agcm_jm;
+       $bjedi_im = $agcm_im;
+       $bjedi_jm = $agcm_jm;
        $anahgrd = substr($res,0,1);
        $jcap_ens = $jcap;
        $ana_im_ens = $ana_im;
@@ -4877,6 +4893,8 @@ EOF
        $hist_pert_jm = 181;
        $apert_im = 288;
        $apert_jm = 181;
+       $bjedi_im = 288;
+       $bjedi_jm = 181;
        $anahgrd = substr($res,0,1);
        $jcap_ens = 126;
        $ana_im_ens = 288;
@@ -4908,6 +4926,8 @@ EOF
        $hist_pert_jm = 361;
        $apert_im = 576;
        $apert_jm = 361;
+       $bjedi_im = 288;
+       $bjedi_jm = 181;
        $anahgrd = substr($res,0,1);
        $jcap_ens = 126;
        $ana_im_ens = 288;
@@ -4937,6 +4957,8 @@ EOF
        $hist_pert_jm = $agcm_jm;
        $apert_im = $agcm_im;
        $apert_jm = $agcm_jm;
+       $bjedi_im = $agcm_im;
+       $bjedi_jm = $agcm_jm;
        $anahgrd = substr($res,0,1);
        $jcap_ens = $jcap;
        $ana_im_ens = $ana_im;
@@ -4969,6 +4991,8 @@ EOF
        $hist_pert_jm = $ana_jm;
        $apert_im = $agcm_im;
        $apert_jm = $agcm_jm;
+       $bjedi_im = $agcm_im;
+       $bjedi_jm = $agcm_jm;
        $anahgrd = "b";
        $jcap_ens = $jcap;
        $ana_im_ens = $ana_im;
@@ -5001,6 +5025,8 @@ EOF
        $hist_pert_jm = $ana_jm;
        $apert_im = $agcm_im;
        $apert_jm = $agcm_jm;
+       $bjedi_im = $agcm_im;
+       $bjedi_jm = $agcm_jm;
        $anahgrd = "c";
        $jcap_ens = $jcap;
        $ana_im_ens = $ana_im;
@@ -5038,6 +5064,8 @@ EOF
        $hist_pert_jm = 181;
        $apert_im = 90;
        $apert_jm = $apert_im * 6;
+       $bjedi_im = 90;
+       $bjedi_jm = $bjedi_im * 6;
        $anahgrd = "d";
        $jcap_ens = 126;
        $ana_im_ens = 288;
@@ -5071,6 +5099,8 @@ EOF
        $hist_pert_jm = 361;
        $apert_im = 180;
        $apert_jm = $apert_im * 6;
+       $bjedi_im = 90;
+       $bjedi_jm = $bjedi_im * 6;
        $anahgrd = "d";
        $use_shmem = 1;
        $jcap_ens = 126;
@@ -5106,6 +5136,8 @@ EOF
        $hist_pert_jm = 361;
        $apert_im = 180;
        $apert_jm = $apert_im * 6;
+       $jdedi_im = 180;
+       $jdedi_jm = $bjedi_im * 6;
        $anahgrd = "e";
        $use_shmem = 1;
        $jcap_ens = 254;
@@ -5141,6 +5173,8 @@ EOF
        $hist_pert_jm = 361;
        $apert_im = 180;
        $apert_jm = $apert_im * 6;
+       $bjedi_im = 180;
+       $bjedi_jm = $bjedi_im * 6;
        $anahgrd = "e";
        $use_shmem = 1;
        $jcap_ens = 254;

src/Applications/GEOSdas_App/gen_silo_arc.pl

@@ -219,7 +219,7 @@ sub restart_info {
     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.trajrst.%y4%m2%d2_%h2z.tar';
+    $lineTAR = '${PESTOROOT}%s/rs/Y%y4/M%m2/%s.bkgcrst.%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");

src/Applications/GEOSdas_App/write_monthly_rc_arc.pl

@@ -106,7 +106,7 @@
                     "prog.sfc"     => 1,
                     "ptrj.prs"     => 1,
                     "traj.lcv"     => 1,
-                    "traj_lcv_rst" => 1,
+                    "bkg_clcv_rst" => 1,
                     "vtx.mix"      => 1,
                     "vtx.prs"      => 1 );
 # main program
@@ -389,7 +389,7 @@ sub get_info_from_SILO {
 
     # add additional hourtype requirements
     #-------------------------------------
-    foreach (qw(traj_lcv_rst)) {
+    foreach (qw(bkg_clcv_rst)) {
         $hourtype{$_} = "$mode{$_}$freq{$_}";
     }
 

src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/atmens_arch.csh

@@ -17,7 +17,7 @@
 #                        eoi0 - arch obs-imp on analysis
 #                        eprg - arch prognostic fields of all members
 #                        erst - arch rst's of all members
-#                        etrj - arch trj's of all members
+#                        ebkgx- arch extra background output of all members
 #                        evtk - arch vortex tracker information
 #                        eoimp- arch ensemble obs-impact-related output
 #                        fstat- arch forecast statistics
@@ -91,7 +91,7 @@ if ( $#argv < 6 ) then
    echo "                          (Default: arch only central bkg files)"
    echo "    ENSARCH_KEEP      - when set will not remove dir with files for arch"
    echo "    ENSARCH_FIELDS    - components (list separate by comma), e.g.,"
-   echo "                          eana,ebkg,edia,eprg,easm,erst,etrj,eoi0,stat,xtra "
+   echo "                          eana,ebkg,edia,eprg,easm,erst,ebkgx,eoi0,stat,xtra "
    echo "                          (Default: stat)          "
    echo "    ENSSILO_KEEP      - when set will not remove siloens dir for current date/time"
    echo "    ENSARCHJOB_KEEP   - will keep cp of archiving script under FVHOME"
@@ -374,11 +374,11 @@ if ( $doall && (-d $myball) ) then
       end
    end
 endif
-# store trj_lcv files
-set myball = $expid.atmens_etrj.${nymdb}_${hhb}z
+# store bkg_clcv files
+set myball = $expid.atmens_ebkgx.${nymdb}_${hhb}z
 if ( -d $myball ) then
    mkdir -p $myball
-  /bin/mv enstraj $myball
+  /bin/mv ensbkgx $myball
 endif
 # store obs-imp on analysis ...
 set myball = $expid.atmens_eoi0.${nymdb}_${hhb}z

src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/atmos_egsi.csh

@@ -539,15 +539,14 @@ while ( $n < $nmem )
      /bin/rm anavinfo
      ln -s ../ensctrl/anavinfo .
 
+     # since setobsvr.csh brings in these files w/ satbias/bang names link them to proper names
      if( -e satbias ) then
-          # since setobsvr.csh brings in these files w/ satbias/bang names link them to proper names
           ln -sf satbias satbias_in
      else
-          echo " ${MYNAME}: Unable to find satbias/bang files to run control-analysis, Aborting ... "
+          echo " ${MYNAME}: Unable to find satbias files to run control-analysis, Aborting ... "
           exit(1)
      endif
      if( -e satbang ) then
-          # since setobsvr.csh brings in these files w/ satbias/bang names link them to proper names
           ln -sf satbang satbias_angle
      endif
      if ( $ACFTBIAS ) then

src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AGCM.rc.tmpl

@@ -26,6 +26,9 @@ SATSIM_DT: 3600
 SOLARAvrg: 0
 IRRADAvrg: 0
 
+ORBIT_ANAL2B: .TRUE.
+EOT: .TRUE.
+
 # UNCOMMENT to use Morrison-Gettelman-Barahona cloud microphysics
 #CLDMICRO: 2MOMENT
 

src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AtmEnsConfig.csh

@@ -31,8 +31,8 @@ setenv ACFTBIAS @ACFTBIAS  # 0: no aircraft bias correction
 # archiving
 # ---------
 setenv ENSARCH_ALLBKG 1   # set this and ALL bkg files are saved in tar ball
-setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst,etrj,eprg,eniana"
-setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst,eniana"
+setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst,ebkgx,eprg,eniana"
+setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst"
 setenv ENSARCH_WALLCLOCK 2:00:00
 setenv ARCHLOC $FVARCH