diff --git a/components.yaml b/components.yaml
index 1b80fe91..456928b2 100644
--- a/components.yaml
+++ b/components.yaml
@@ -48,7 +48,7 @@ GMAOpyobs:
AeroML:
local: ./src/Shared/@AeroML
remote: ../AeroML.git
- tag: v1.5.0
+ tag: v1.5.1
develop: develop
sparse: ./config/AeroML.sparse
@@ -111,7 +111,7 @@ GigaTraj:
g5pert:
local: ./src/Components/@g5pert
remote: ../g5pert.git
- tag: v1.1.2
+ tag: v1.1.3
develop: main
GEOSagcmPert_GridComp:
diff --git a/src/Applications/GEOSdas_App/fvsetup b/src/Applications/GEOSdas_App/fvsetup
index 62247b1a..73fbb0bc 100755
--- a/src/Applications/GEOSdas_App/fvsetup
+++ b/src/Applications/GEOSdas_App/fvsetup
@@ -392,6 +392,7 @@ my ($landbcs);
my ($coupled, $ores, $mometc);
my ($o_servers,$bckend_wrts, $xncpus, $ncpus_per_node);
my ($skipgsi);
+my ($jedi_ensrpy, $jedi_exprpy);
my ($sysfile, $nodeflg);
my (@rmTilde);
@@ -2526,6 +2527,9 @@ sub ed_aens_das_replay_acq {
$replay_arcdir = "/discover/nobackup/projects/gmao/advda/rtodling/archive/x0044";
$replay_arcdir = query("Replay archive directory?", $replay_arcdir);
+ $jedi_ensrpy = $replay_arcdir;
+ $jedi_exprpy = $aens_replay_expid;
+
$acq = "$fvhome/$mydir/atmens_replay.acq";
open(SCRIPT,">$acq") or die ">>> ERROR <<< cannot write $acq";
print SCRIPT <<"EOF";
@@ -3702,20 +3706,31 @@ sub set_geosjedi {
if ( ! $ENV{GEOSJEDI} ) { return 0 };
$nogsi = " ";
- if ( $skipgsi ) { $nogsi = "-nogsi" };
-
- if( $ENV{OFFLINE_IODA_DIR} ) {
- $iodadir = $ENV{OFFLINE_IODA_DIR};
+ if ( $skipgsi ) {
+ $nogsi = "-nogsi";
+ if( $ENV{OFFLINE_IODA_DIR} ) {
+ $iodadir = $ENV{OFFLINE_IODA_DIR};
+ } else {
+# $iodadir = "/discover/nobackup/projects/gmao/dadev/rtodling/archive/541/Milan/x0050/ioda/";
+ $iodadir = "/discover/nobackup/projects/gmao/dadev/rtodling/archive/544/x0054/ioda/";
+ }
} else {
- $iodadir = "/discover/nobackup/projects/gmao/dadev/rtodling/archive/541/Milan/x0050/ioda/";
+ $iodadir = "/dev/null"; # this expects ncdiag files to be created by GSI
+ # so that JEDIana can convert files to IODA on the fly
+ }
+ $xtra4jedi = "";
+ if ( $jedi_ensrpy ) {
+ $xtra4jedi = "-ensrpy $jedi_ensrpy -exprpy $jedi_exprpy";
}
- $jediopts = "-fvhome $fvhome -iodadir $iodadir -archive $acqloc -gcmres $agcm_im $nogsi";
+ $jediopts = "-fvhome $fvhome -iodadir $iodadir -archive $acqloc -gcmres $agcm_im $nogsi $xtra4jedi";
if ( $ENV{JEDI_ATMVAR_SCHEME} ) {
$jedivar = $ENV{JEDI_ATMVAR_SCHEME};
} else {
if ( $hyb_ens < 3 ) {
$jedivar = "3dfgat";
+ } elsif ( $hyb_ens == 3 ) {
+ $jedivar = "hyb3denvar";
} else {
$jedivar = "hyb4denvar";
}
diff --git a/src/Applications/GEOSdas_App/jedi/CMakeLists.txt b/src/Applications/GEOSdas_App/jedi/CMakeLists.txt
index 4bd60a19..62e5e5c0 100644
--- a/src/Applications/GEOSdas_App/jedi/CMakeLists.txt
+++ b/src/Applications/GEOSdas_App/jedi/CMakeLists.txt
@@ -1,9 +1,10 @@
add_subdirectory(etc)
file(GLOB perlscripts *.pl)
+file(GLOB pythonscripts *.py)
file(GLOB pmscripts *.pm)
file(GLOB cshscripts *.csh)
install(
- PROGRAMS ${perlscripts} ${pmscripts} ${cshscripts}
+ PROGRAMS ${perlscripts} ${pmscripts} ${pythonscripts} ${cshscripts}
DESTINATION bin)
diff --git a/src/Applications/GEOSdas_App/jedi/assemble_obs_yaml.pl b/src/Applications/GEOSdas_App/jedi/assemble_obs_yaml.pl
new file mode 100755
index 00000000..791d6bc2
--- /dev/null
+++ b/src/Applications/GEOSdas_App/jedi/assemble_obs_yaml.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+use File::Spec;
+
+# Need at least: dir + one file + output
+die "Usage: perl combine.pl
[file2 ...]