Skip to content

Auto GitFlow - develop → MAPL-v3 - Fixes for icx #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 9 commits into
base: release/MAPL-v3
Choose a base branch
from
Open

Auto GitFlow - develop → MAPL-v3 - Fixes for icx #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6be289
no check for automation
weiyuan-jiang Mar 12, 2026
9200b6c
Fixes for icx
mathomp4 Mar 12, 2026
efd81e5
replace link to jpp x51 experiment with user $FVHOME/run/jedi
karpob Apr 28, 2026
329dd6f
Merge branch 'develop' into feature/fixes-for-ifx
rtodling May 1, 2026
2b81c32
Merge pull request #424 from GEOS-ESM/feature/fixes-for-ifx
rtodling May 1, 2026
c63df63
Merge branch 'develop' into bugfix/karpob/jedi_obsop_name_hardpath
rtodling May 1, 2026
b74ea46
Merge pull request #428 from GEOS-ESM/bugfix/karpob/jedi_obsop_name_h…
rtodling May 1, 2026
b9a456c
Merge branch 'develop' into feature/wjiang/no_check_auto
rtodling May 1, 2026
f817c85
Merge pull request #423 from GEOS-ESM/feature/wjiang/no_check_auto
rtodling May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/Applications/GEOSdas_App/jedi/etc/geos_jediobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/Applications/GEOSdas_App/testsuites/runjob.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions src/Applications/NCEP_Paqc/block-unblock/reblock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
!---------------------------------------------------------------------- */

#include <stdio.h>
#include <stdlib.h>

#define BUFSIZE 50000
int WORDSIZE;
Expand Down
Loading