Merge pull request #365 from GEOS-ESM/feature/rtodling/more_flexible_cov_settings

Intro various DA strategies

Author: rtodling

src/Applications/GEOSdas_App/GEOSdas.csm

@@ -1611,7 +1611,7 @@ exit 1
   Sub CreateIAUincrement4Fcst_()
 # -------------------------------------
   if ( $?ECHO___ ) set echo
-  if ( $SKIPGSI && ! -e $FVHOME/run/AGCM.BOOTSTRAP.rc.tmpl ) exit 0
+  if ( $SKIPGSI && -e $FVHOME/run/AGCM.BOOTSTRAP.rc.tmpl ) exit 0
 
      if ( ! $DO4DIAU ) then
         if ( -e agcm_import_rst ) exit 0  # no need to regenerate IAU increment if already available

src/Applications/GEOSdas_App/fvsetup

@@ -3703,10 +3703,14 @@ sub set_geosjedi {
   }
   $jediopts = "-fvhome $fvhome -iodadir $iodadir -archive $acqloc $nogsi";
 
-  if ( $hyb_ens < 3 ) { 
-    $jedivar = "3dfgat";
+  if ( $ENV{JEDI_ATMVAR_SCHEME} ) {
+      $jedivar = $ENV{JEDI_ATMVAR_SCHEME};
   } else {
-    $jedivar = "hyb4denvar";
+    if ( $hyb_ens < 3 ) { 
+      $jedivar = "3dfgat";
+    } else {
+      $jedivar = "hyb4denvar";
+    }
   }
 
   $cmd = "$fvbin/setup_aanajedi.pl $jedivar $expid $bjedi_im $jediopts";

src/Applications/GEOSdas_App/jedi/etc/CMakeLists.txt

@@ -4,8 +4,10 @@ set (ALLETC
    diffstates_geos.yaml
    geos_3dvar.yaml
    geos_3dfgat.yaml
+   geos_hyb3dcenvar.yaml
    geos_hyb4dcenvar.yaml
    geos_hyb4denvar.yaml
+   geos_jediobs.yaml
    jedi_acquire_bkg.j
    jedi_acquire_ebkg.j
    jedi_acquire_ioda.j