diff --git a/components.yaml b/components.yaml index 1b80fe91..8b919e3a 100644 --- a/components.yaml +++ b/components.yaml @@ -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/jedi/etc/geos_jediobs.yaml b/src/Applications/GEOSdas_App/jedi/etc/geos_jediobs.yaml index c7cc7326..6ebab0da 100644 --- a/src/Applications/GEOSdas_App/jedi/etc/geos_jediobs.yaml +++ b/src/Applications/GEOSdas_App/jedi/etc/geos_jediobs.yaml @@ -32204,7 +32204,7 @@ obs operator: name: VertInterp vertical coordinate: air_pressure - observation alias file: /discover/nobackup/projects/gmao/dadev/rtodling/JEDI/x51/jprePP/run/jedi/Config/obsop_name_map.yaml + observation alias file: $FVHOME/run/jedi/Config/obsop_name_map.yaml obs filters: # range sanity check - filter: Bounds Check @@ -32239,7 +32239,7 @@ obs operator: name: VertInterp vertical coordinate: air_pressure - observation alias file: /discover/nobackup/projects/gmao/dadev/rtodling/JEDI/x51/jprePP/run/jedi/Config/obsop_name_map.yaml + observation alias file: $FVHOME/run/jedi/Config/obsop_name_map.yaml obs filters: # range sanity check - filter: Bounds Check diff --git a/src/Applications/GEOSdas_App/testsuites/runjob.pl b/src/Applications/GEOSdas_App/testsuites/runjob.pl index 5ae6d90f..b849721a 100644 --- a/src/Applications/GEOSdas_App/testsuites/runjob.pl +++ b/src/Applications/GEOSdas_App/testsuites/runjob.pl @@ -815,7 +815,9 @@ sub run_fvsetup { if ($verify) { print "\nUnless you are sure the input file is okay, you should quit" . " and run the checkinput utility before continuing.\n"; - $ans = query("Continue (y/n)?", "n"); + if ($nocheck) { $dflt = "y" } + else { $dflt = "n" } + $ans = query("Continue (y/n)?", $dflt); quit("Quitting.") if neg($ans); } diff --git a/src/Applications/NCEP_Paqc/block-unblock/reblock.c b/src/Applications/NCEP_Paqc/block-unblock/reblock.c index a3106e5f..cc5b02cb 100644 --- a/src/Applications/NCEP_Paqc/block-unblock/reblock.c +++ b/src/Applications/NCEP_Paqc/block-unblock/reblock.c @@ -22,6 +22,7 @@ !---------------------------------------------------------------------- */ #include +#include #define BUFSIZE 50000 int WORDSIZE;