Skip to content

Commit

Permalink
Merge pull request #303 from GEOS-ESM/feature/rtodling/ompslp_n_minor…
Browse files Browse the repository at this point in the history 
…EnsDiagRev

Feature/rtodling/ompslp n minor ens diag rev
  • Loading branch information
@rtodling
rtodling authored Nov 12, 2024
2 parents 4d0461b + 6843344 commit 5462b23
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 61 deletions.
4 changes: 2 additions & 2 deletions components.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ FMS:
GEOSana_GridComp:
local: ./src/Components/@GEOSana_GridComp
remote: ../GEOSana_GridComp.git
tag: g5.41.3
tag: g5.41.4
develop: develop

mksi:
local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi
remote: ../GEOS_mksi.git
tag: g5.41.2
tag: g5.41.3
develop: develop

GEOSgcm_GridComp:
Expand Down
54 changes: 37 additions & 17 deletions src/Applications/GEOSdas_App/fvsetup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ use File::Path qw(mkpath rmtree);
use Getopt::Long qw(GetOptions);
use Sys::Hostname;
use Time::Local; # time functions
use POSIX qw(ceil);

use FindBin; # so we can find where this script resides
use lib ("$FindBin::Bin", "$ESMADIR/$ARCH/bin");
Expand Down Expand Up @@ -388,7 +389,7 @@ my ($acqloc);
my ($fcstimes,$fcswait_hrs,$asnwait_hrs);
my ($landbcs);
my ($coupled, $ores, $mometc);
my ($o_servers,$bckend_wrts);
my ($o_servers,$bckend_wrts, $xncpus, $ncpus_per_node);

my ($sysfile, $nodeflg);
my (@rmTilde);
Expand Down Expand Up @@ -3210,8 +3211,8 @@ sub get_times {
# # ----
if ($res eq "C48") { $nx = 4; $ny = 24 } # (b) 96
elsif ($res eq "C90") { $nx = 4; $ny = 24 } # (c) 96
elsif ($res eq "C180") { $nx = 15; $ny = 36 } # (d) 360
elsif ($res eq "C360") { $nx = 8; $ny = 48 } # (e) 384
elsif ($res eq "C180") { $nx = 9; $ny = 30 } # (d) 270
elsif ($res eq "C360") { $nx = 10; $ny = 36 } # (e) 360
else { $nx = 28; $ny = 48 } # (f+) 1344
}
else {
Expand All @@ -3225,6 +3226,7 @@ sub get_times {
$ncpus = $nx * $ny;
$ncpus_per_node /= 2 if $ncpus_per_node and $hres eq "e";
if ( $g5gcm ) {
$jobn = "g5das";
$jobf = "g5fcst";
Expand Down Expand Up @@ -3323,6 +3325,8 @@ EOF
$nx = query(" Number of PEs in the zonal direction (NX)?", $nx);
$ny = query(" Number of PEs in the meridional direction (NY)?", $ny);
$ncpus = $nx * $ny;
my $this_many_nodes = ceil($ncpus/$ncpus_per_node) + $o_servers;
$xncpus = $this_many_nodes * $ncpus_per_node;
$jobn = query(" Job nickname?", $jobn);
$jobn = substr($jobn,0,5);
Expand Down Expand Up @@ -3633,10 +3637,10 @@ EOF
$nxgsi = query(" Number of procs in the zonal direction (NX)?", $nxDEF);
$nygsi = query(" Number of procs in the meridional direction (NY)?", $nyDEF);
$ncpus_gsi = $nxgsi * $nygsi;
last if $ncpus_gsi <= $ncpus;
last if $ncpus_gsi <= $xncpus;
print "\n >>> WARNING <<<"
. "\n GSI CPUs ($ncpus_gsi) exceeds total number of CPUs ($ncpus)\n";
. "\n GSI CPUs ($ncpus_gsi) exceeds total number of CPUs ($xncpus)\n";
die ">>> ERROR <<< too many unsuccessful attempts;" if ++$cnt > 3;
print " Try again.\n\n";
}
Expand Down Expand Up @@ -4811,7 +4815,6 @@ EOF
$use_shmem = 0;
$o_servers = 0;
$bckend_wrts = 0;
$ios_nds = 1;
$cldmicro = "1MOMENT";
if ( "$res" eq "c" && "$vres" eq "55" ) {
$anahgrd = substr($res,0,1);
Expand Down Expand Up @@ -5115,7 +5118,6 @@ EOF
$bckend_wrts = 24;
}
$cubed = 1;
# $ios_nds = 2;
$specres = "254";
$jcap = "254";
$agcm_grid_type = "Cubed-Sphere";
Expand Down Expand Up @@ -5150,8 +5152,9 @@ EOF
$ana_im_ens = 288;
$ana_jm_ens = 181;
} elsif ( "$res" eq "C360" ) { # Cubed-sphere
$o_servers = 3;
$bckend_wrts = 24;
$cubed = 1;
# $ios_nds = 2;
$specres = "254";
$jcap = "254";
$agcm_grid_type = "Cubed-Sphere";
Expand Down Expand Up @@ -5189,7 +5192,7 @@ EOF
} elsif ( "$res" eq "C720" ) { # Cubed-sphere
$cubed = 1;
$o_servers = 8;
$bckend_wrts = 8;
$bckend_wrts = 36;
$specres = "254";
$jcap = "254";
$agcm_grid_type = "Cubed-Sphere";
Expand Down Expand Up @@ -5227,7 +5230,7 @@ EOF
} elsif ( "$res" eq "C1440" ) { # Cubed-sphere
$cubed = 1;
$o_servers = 8;
# $ios_nds = 4;
$bckend_wrts = 36;
$specres = "254";
$jcap = "254";
$agcm_grid_type = "Cubed-Sphere";
Expand Down Expand Up @@ -5589,10 +5592,13 @@ sub archiving_rules {
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_msu_tirosn_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_omi_aura_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpnc_npp_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpnc_n21_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpuv_npp_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpvis_npp_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnm_npp_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnmeff_npp_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnmeff_n20_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnmeff_n21_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnp_npp_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnpnc_npp_%c%c%c.%y4%m2%d2_%h2z.bin
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_pcp_tmi_%c%c%c%c_%c%c%c.%y4%m2%d2_%h2z.bin
Expand Down Expand Up @@ -5647,10 +5653,13 @@ sub archiving_rules {
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_msu_tirosn.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_omi_aura.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpnc_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpnc_n21.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpuv_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpvis_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnm_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnmeff_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnmeff_n20.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnmeff_n21.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnp_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnpnc_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_pcp_ssmi_dmsp%c%c.%y4%m2%d2_%h2z.ods
Expand Down Expand Up @@ -5704,10 +5713,13 @@ sub archiving_rules {
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_msu_tirosn.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_omi_aura.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompslpnc_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompslpnc_n21.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompslpuv_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompslpvis_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompsnm_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompsnmeff_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompsnmeff_n20.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompsnmeff_n21.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompsnp_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_ompsnpnc_npp.%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp0hr_diag_pcp_ssmi_%c%c%c%c.%y4%m2%d2_%h2z.ods
Expand Down Expand Up @@ -5745,6 +5757,7 @@ sub archiving_rules {
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_sbuv%c_%c%c%c_%c%c%c_%c%c%c%c.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.bin
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_omi_aura_%c%c%c_%c%c%c%c.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.bin
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpnc_npp_%c%c%c_%c%c%c%c.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.bin
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpnc_n21_%c%c%c_%c%c%c%c.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.bin
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpuv_npp_%c%c%c_%c%c%c%c.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.bin
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompslpvis_npp_%c%c%c_%c%c%c%c.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.bin
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.diag_ompsnm_npp_%c%c%c_%c%c%c%c.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.bin
Expand Down Expand Up @@ -5782,6 +5795,7 @@ sub archiving_rules {
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_sbuv%c_%c%c%c_%c%c%c_%c%c%c%c.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_omi_aura_%c%c%c_%c%c%c%c.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnc_npp_%c%c%c_%c%c%c%c.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnc_n21_%c%c%c_%c%c%c%c.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpuv_npp_%c%c%c_%c%c%c%c.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpvis_npp_%c%c%c_%c%c%c%c.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnm_npp_%c%c%c_%c%c%c%c.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
Expand Down Expand Up @@ -5820,6 +5834,7 @@ sub archiving_rules {
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_sbuv%c_%c%c%c_%c%c%c_%c%c%c%c.sigo.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_omi_aura_%c%c%c_%c%c%c%c.sigo.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnc_npp_%c%c%c_%c%c%c%c.sigo.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnc_n21_%c%c%c_%c%c%c%c.sigo.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpuv_npp_%c%c%c_%c%c%c%c.sigo.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpvis_npp_%c%c%c_%c%c%c%c.sigo.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnm_npp_%c%c%c_%c%c%c%c.sigo.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
Expand Down Expand Up @@ -7015,12 +7030,15 @@ sub arch_asens {
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_omi_aura.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_omieff_aura.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnc_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnc_n21.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpuv_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpvis_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnm_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
#\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompslpnp_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnm_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnmeff_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnmeff_n20.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnmeff_n21.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnp_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_ompsnpnc_npp.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
\${PESTOROOT}%s/obs/Y%y4/M%m2/D%d2/H%h2/%s.imp%c_%c%c%c_o3lev_aura.obs.%y4%m2%d2_%h2z+%y4%m2%d2_%h2z-%y4%m2%d2_%h2z.ods
Expand Down Expand Up @@ -7726,8 +7744,6 @@ if ( $fvchem && $lm > 2 ) {
}
$pi = $i; # p for PSAS
my $xncpus = $ncpus + $o_servers * $ncpus_per_node;
# Turn off some parallelization on discover
#------------------------------------------
if ( ($siteID eq "nccs") || ($siteID eq "nas") ) {
Expand Down Expand Up @@ -7780,6 +7796,7 @@ print SCRIPT <<"EOF";
#SBATCH --ntasks-per-node=$ncpus_per_node
#SBATCH --constraint=$nodeflg
#SBATCH --time=${daswallclk}:00
#SBATCH --no-requeue
EOF
}else{
Expand Down Expand Up @@ -7885,7 +7902,7 @@ print SCRIPT <<"EOF";
# (i) comment out line below
# (ii) uncomment and adjust following line
setenv FVWORK $diren/fvwork.\$\$
# setenv FVWORK \$TSE_TMPDIR/fvwork.\$\$
# setenv FVWORK \$TSE_TMPDIR/$user/fvwork.\$\$
if (\$?kidwork) then # this case, overwrite FVWORK with user-specific
setenv FVWORK \$kidwork
endif
Expand Down Expand Up @@ -8925,8 +8942,6 @@ sub create_fscript {
open(SCRIPT,">$fvhome/fcst/$jobf.j") or
die ">>> ERROR <<< cannot write $fvhome/fcst/$jobf.j";
my $xncpus = $ncpus + $o_servers * $ncpus_per_node;
print SCRIPT <<"EOF";
#!/bin/csh -fx
# ------------------------------------------
Expand All @@ -8949,6 +8964,7 @@ print SCRIPT <<"EOF";
#SBATCH --ntasks-per-node=$ncpus_per_node
#SBATCH --constraint=$nodeflg
#SBATCH --time=${fcswallclk}:00
#SBATCH --no-requeue
EOF
}else{
Expand Down Expand Up @@ -9036,7 +9052,7 @@ print SCRIPT <<"EOF";
setenv FVWORK $fvhome/../tmp.\$\$
if( -d \$FVWORK ) /bin/rm -r \$FVWORK
/bin/mkdir -p \$FVWORK
# setenv FVWORK \$TSE_TMPDIR/tmp.\$\$
# setenv FVWORK \$TSE_TMPDIR/$user/tmp.\$\$
if (-e /usr/bin/lfs) then
/usr/bin/lfs setstripe -c 1 -s 1048576 -i -1 \$FVWORK
endif
Expand Down Expand Up @@ -9818,7 +9834,11 @@ sub init_agcm_rc {
AGCM_label_subst("\@GRID_TYPE", $agcm_grid_type);
AGCM_label_subst("\@CUBE_AGCM", $cube_agcm);
AGCM_label_subst("\@LATLON_AGCM", $latlon_agcm);
AGCM_label_subst("\@NUM_OSERVER_NODES", $ios_nds);
if ( $o_servers > 0 ) {
AGCM_label_subst("\@NUM_OSERVER_NODES", $o_servers);
} else {
AGCM_label_subst("\@NUM_OSERVER_NODES", 1);
}
AGCM_label_subst("\@NUM_BACKEND_PES", $bckend_wrts);
AGCM_label_subst("\@AANA_IM", $ana_im);
Expand Down
18 changes: 9 additions & 9 deletions src/Applications/GEOSdas_App/testsuites/x0050RPY_summer.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ Catchment Model choice? [1]
>

FVHOME? [/discover/nobackup/dao_it/x0050RPY]
> /discover/nobackup/projects/gmao/dadev/dao_it/$expid
> /discover/nobackup/projects/gmao/dadev/TSE_staging/dao_it/$expid

The directory /discover/nobackup/projects/gmao/obsdev/dao_it/x0050RPY already exists. Clean it? [y]
The directory /discover/nobackup/projects/gmao/dadev/TSE_staging/dao_it/x0050RPY already exists. Clean it? [y]
>

Processing nodes (1:Haswell, 2:Skylake, 3:Cascase, 4:Milan)? [2]
>
> 4

Which case of variational analysis? [1]
>
Expand Down Expand Up @@ -81,7 +81,7 @@ AeroCom? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/AeroCom]
>

FVICS? [/archive/u/jstassi/restarts/GEOSadas-5_24_0]
> /discover/nobackup/projects/gmao/dadev/rtodling/archive/Restarts/5_41/c360/c360.rst.20230714_21z.tar
> /discover/nobackup/projects/gmao/dadev/rtodling/archive/Restarts/5_41/c360/BCstrato/c360.rst.20230714_21z.tar

Run model-adjoint-related applications (0=no,1=yes)? [0]
> 1
Expand All @@ -98,7 +98,7 @@ Run singular vector experiments (0=n,1=yes)? [0]
Run analysis-sensitivity applications (0=no,1=yes)? [0]
> 1

Verifying experiment id: [x50Rrt]
Verifying experiment id: [x0050RPY]
>

Ending year-month-day? [20191121]
Expand All @@ -110,11 +110,11 @@ Length of FORECAST run segments (in hours)? [123]
Number of one-day DAS segments per PBS job? [1]
>

Number of PEs in the zonal direction (NX)? [8]
Number of PEs in the zonal direction (NX)? [10]
> 12

Number of PEs in the meridional direction (NY)? [48]
> 72
Number of PEs in the meridional direction (NY)? [36]
> 48

Job nickname? [g5das]
> x50r
Expand Down Expand Up @@ -150,7 +150,7 @@ Which main class of ObsSys (1: NRT; 2: MERRA; 3: MERRA-2; 4: GEOS-IT; 5: R21C)?
>

OBSERVING SYSTEM CLASSES?
> disc_airs_bufr,disc_amsua_bufr,gmao_amsr2_bufr,gmao_gmi_bufr,mls_nrt_nc,ncep_1bamua_bufr,ncep_1bhrs4_bufr,ncep_acftpfl_bufr,ncep_atms_bufr,ncep_aura_omi_bufr,ncep_avcsam_bufr,ncep_avcspm_bufr,ncep_crisfsr_bufr,ncep_goesfv_bufr,ncep_gpsro_bufr,ncep_mhs_bufr,ncep_mtiasi_bufr,ncep_prep_bufr,ncep_satwnd_bufr,ncep_ssmis_bufr,ncep_tcvitals,npp_ompsnm_bufr,gmao_mlst_bufr
> disc_airs_bufr,disc_amsua_bufr,gmao_amsr2_bufr,gmao_gmi_bufr,mls_nrt_nc,ncep_1bamua_bufr,ncep_acftpfl_bufr,ncep_atms_bufr,ncep_aura_omi_bufr,ncep_avcsam_bufr,ncep_avcspm_bufr,ncep_crisfsr_bufr,ncep_goesfv_bufr,ncep_gpsro_bufr,ncep_mhs_bufr,ncep_mtiasi_bufr,ncep_prep_bufr,ncep_satwnd_bufr,ncep_ssmis_bufr,ncep_tcvitals,npp_ompsnm_bufr,r21c_npp_ompslp_nc,m2scr_n21_ompslp_nc,gmao_mlst_bufr

CHECKING OBSYSTEM? [2]
> 1
Expand Down
14 changes: 7 additions & 7 deletions src/Applications/GEOSdas_App/testsuites/x0050_summer.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ Catchment Model choice? [1]
>

FVHOME? [/discover/nobackup/dao_it/x0050]
> /discover/nobackup/projects/gmao/dadev/dao_it/Summer_Runs/$expid
> /discover/nobackup/projects/gmao/dadev/TSE_staging/dao_it/Summer_Runs/$expid

The directory /discover/nobackup/projects/gmao/obsdev/dao_it/x0050 already exists. Clean it? [y]
The directory /discover/nobackup/projects/gmao/dadev/TSE_staging/dao_it/x0050 already exists. Clean it? [y]
>

Processing nodes (1:Haswell, 2:Skylake, 3:Cascase, 4:Milan)? [2]
Expand Down Expand Up @@ -81,7 +81,7 @@ AeroCom? [/discover/nobackup/projects/gmao/share/gmao_ops/fvInput_4dvar/AeroCom]
>

FVICS? [/archive/u/jstassi/restarts/GEOSadas-5_24_0]
> /discover/nobackup/projects/gmao/dadev/rtodling/archive/Restarts/5_41/c360/c360.rst.20230714_21z.tar
> /discover/nobackup/projects/gmao/dadev/rtodling/archive/Restarts/5_41/c360/BCstrato/c360.rst.20230714_21z.tar

Run model-adjoint-related applications (0=no,1=yes)? [0]
> 1
Expand Down Expand Up @@ -110,11 +110,11 @@ Length of FORECAST run segments (in hours)? [123]
Number of one-day DAS segments per PBS job? [1]
>

Number of PEs in the zonal direction (NX)? [8]
Number of PEs in the zonal direction (NX)? [10]
> 12

Number of PEs in the meridional direction (NY)? [48]
> 72
Number of PEs in the meridional direction (NY)? [36]
> 48

Job nickname? [g5das]
> x50
Expand Down Expand Up @@ -150,7 +150,7 @@ Which main class of ObsSys (1: NRT; 2: MERRA; 3: MERRA-2; 4: GEOS-IT; 5: R21C)?
>

OBSERVING SYSTEM CLASSES?
> disc_airs_bufr,disc_amsua_bufr,gmao_amsr2_bufr,gmao_gmi_bufr,mls_nrt_nc,ncep_1bamua_bufr,ncep_acftpfl_bufr,ncep_atms_bufr,ncep_aura_omi_bufr,ncep_avcsam_bufr,ncep_avcspm_bufr,ncep_crisfsr_bufr,ncep_goesfv_bufr,ncep_gpsro_bufr,ncep_mhs_bufr,ncep_mtiasi_bufr,ncep_prep_bufr,ncep_satwnd_bufr,ncep_ssmis_bufr,ncep_tcvitals,npp_ompsnm_bufr,gmao_mlst_bufr
> disc_airs_bufr,disc_amsua_bufr,gmao_amsr2_bufr,gmao_gmi_bufr,mls_nrt_nc,ncep_1bamua_bufr,ncep_acftpfl_bufr,ncep_atms_bufr,ncep_aura_omi_bufr,ncep_avcsam_bufr,ncep_avcspm_bufr,ncep_crisfsr_bufr,ncep_goesfv_bufr,ncep_gpsro_bufr,ncep_mhs_bufr,ncep_mtiasi_bufr,ncep_prep_bufr,ncep_satwnd_bufr,ncep_ssmis_bufr,ncep_tcvitals,npp_ompsnm_bufr,r21c_npp_ompslp_nc,m2scr_n21_ompslp_nc,gmao_mlst_bufr

CHECKING OBSYSTEM? [2]
> 1
Expand Down
8 changes: 4 additions & 4 deletions src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/etc/AtmEnsConfig.csh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ setenv ACFTBIAS @ACFTBIAS # 0: no aircraft bias correction
setenv ENSARCH_ALLBKG 1 # set this and ALL bkg files are saved in tar ball
setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst,ebkgx,eprg,eniana"
setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst"
setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst,ebkgx"
setenv ENSARCH_FIELDS "eana,ebkg,stat,ecbkg,eoi0,edia,ebaer,erst,ebkgx,edstat"
setenv ENSARCH_WALLCLOCK 2:00:00
setenv ARCHLOC $FVARCH

Expand Down Expand Up @@ -139,7 +139,7 @@ setenv MPIRUN_ENSANA "$ATMENS_MPIRUN -np $ENSGSI_NCPUS GSIsa.x" # esma_mpir

# setup_perts.csh
#----------------
#_SLES15 setenv AENS_PERTS_DSTJOB 8
# setenv AENS_PERTS_DSTJOB 8
setenv PERTS_QNAME $ATMENS_QNAME
setenv PERTS_WALLCLOCK 1:00:00
setenv PERTS_NCPUS 24
Expand All @@ -154,8 +154,8 @@ setenv AENSTAT_QNAME $ATMENS_QNAME

# post-egcm calculations
# ----------------------
setenv PEGCM_ALLPARALLEL 0
setenv PEGCM_ARRAY 0
setenv PEGCM_ALLPARALLEL 1
#setenv PEGCM_ARRAY 1
setenv PEGCM_WALLCLOCK 1:00:00
setenv PEGCM_QNAME $ATMENS_QNAME

Expand Down
Loading

0 comments on commit 5462b23

Please sign in to comment.