Skip to content

Auto GitFlow - develop → MAPL-v3 - fix to dycore output mx/my cu/cv #372

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

Merged
mathomp4 merged 4 commits into from
May 20, 2025
Merged

Auto GitFlow - develop → MAPL-v3 - fix to dycore output mx/my cu/cv #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb8a81b
fix to dycore output mx/my cu/cv
rtodling May 20, 2025
9bebd5d
minor fix to setup geos-jedi
rtodling May 20, 2025
e5ff7fe
fp history fix
rtodling May 20, 2025
cb5ad9e
Merge pull request #371 from GEOS-ESM/bugfix/rtodling/fvdycore_fix_si…
rtodling May 20, 2025
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
4 changes: 2 additions & 2 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ GEOSagcmPert_GridComp:
FVdycoreCubed_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
remote: ../FVdycoreCubed_GridComp.git
tag: v2.13.0
tag: v2.13.1
develop: develop

fvdycore:
Expand Down Expand Up @@ -251,7 +251,7 @@ umwm:
GEOSgcm_App:
local: ./src/Applications/@GEOSgcm_App
remote: ../GEOSgcm_App.git
tag: g2.3.8.2
tag: g2.3.8.3
develop: develop

Ocean-LETKF:
Expand Down
18 changes: 13 additions & 5 deletions src/Applications/GEOSdas_App/jedi/setup_aanajedi.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ sub init {

# Var run configuration parameters
$agcm_im = $hres;
if ( $opt_gcm ) { $agcm_im = $gcmres };
if ( $opt_gcmres ) { $agcm_im = $gcmres };
$agcm_jm = 6 * $agcm_im;
$agcm_lm = $vres;
$cres = $hres + 1;
Expand Down Expand Up @@ -279,6 +279,14 @@ sub init {
$ncpus_var = $varxlayout * $varylayout * 6;
if ( $scheme eq "hyb4dcenvar" ) {$ncpus_var = $ncpus_var * 7}; # wired to hourly background

# mkiau pe-settings
$mkiau_nx = 2;
$mkiau_ny = 12;
if ( $agcm_im == 720 ) {
$mkiau_nx = 4;
$mkiau_ny = 24;
}

# build internal variables

@rc2conf = qw ( diffstates_geos.yaml
Expand Down Expand Up @@ -339,7 +347,7 @@ sub install {
if ( $hybridvar ) {
ed_var_yaml ("$JEDIHOME/Config","diffstates_geos.yaml");
}
ed_mkiau ("$JEDIHOME/Config","mkiau.rc.env");
ed_mkiau_rc ("$JEDIHOME/Config","mkiau.rc.tenv");

# take care of satbias acq
ed_jedibkg_acq ("$JEDIHOME/Config");
Expand Down Expand Up @@ -408,7 +416,7 @@ sub set_jedi_static{

}
#......................................................................
sub ed_miau_rc {
sub ed_mkiau_rc {

my($mydir,$config) = @_;

Expand All @@ -424,8 +432,8 @@ sub ed_miau_rc {
#---------------------------------------
while( defined($rcd = <LUN>) ) {
chomp($rcd);
if($rcd =~ /\@NX/) {$rcd=~ s/\@NX/$miau_nx/g; }
if($rcd =~ /\@NY/) {$rcd=~ s/\@NY/$miau_ny/g; }
if($rcd =~ /\@NX/) {$rcd=~ s/\@NX/$mkiau_nx/g; }
if($rcd =~ /\@NY/) {$rcd=~ s/\@NY/$mkiau_ny/g; }
if($rcd =~ /\@AGCM_IM/) {$rcd=~ s/\@AGCM_IM/$agcm_im/g; }
if($rcd =~ /\@AGCM_JM/) {$rcd=~ s/\@AGCM_JM/$agcm_jm/g; }
if($rcd =~ /\@AGCM_LM/) {$rcd=~ s/\@AGCM_LM/$agcm_lm/g; }
Expand Down