Skip to content

Commit

Permalink
Merge pull request #201 from GEOS-ESM/feature/rtodling/geosit_15aug2022
Browse files Browse the repository at this point in the history 
Feature/rtodling/geosit 15aug2022
  • Loading branch information
@rtodling
rtodling authored Aug 29, 2022
2 parents 1d2d563 + 0732926 commit 5b1a2a2
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
6 changes: 3 additions & 3 deletions components.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NCEP_Shared:
GMAO_Shared:
local: ./src/Shared/@GMAO_Shared
remote: ../GMAO_Shared.git
tag: rt1_4_10_geosit4
tag: rt1_4_10_geosit5
develop: main

MAPL:
Expand Down Expand Up @@ -101,7 +101,7 @@ geos-chem:
GOCART:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART
remote: ../GOCART.git
tag: rt1.0.1_geosit2
tag: rt1.0.1_geosit3
sparse: ./config/GOCART.sparse
develop: develop

Expand All @@ -121,7 +121,7 @@ mom6:
GEOSgcm_App:
local: ./src/Applications/@GEOSgcm_App
remote: ../GEOSgcm_App.git
tag: rt1.5.6_geosit_hist4
tag: rt1.5.6_geosit_hist5
develop: develop

UMD_Etc:
Expand Down
22 changes: 11 additions & 11 deletions src/Applications/GEOSdas_App/GEOSdas.csm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@
if ( !($?WCONSTRAINT) ) setenv WCONSTRAINT 0

if ( $BATCH_SUBCMD == "sbatch" ) then
setenv blockflag "-W"
setenv BLOCKFLAG "-W"
else
setenv blockflag "-W block=true"
setenv BLOCKFLAG "-W block=true"
endif

if ( !($?doPLOTS) ) setenv doPLOTS 0
Expand Down Expand Up @@ -1553,7 +1553,7 @@ exit 1
fname2 " acquire -v -rc blend.acq -s $spool -d . -strict $nymd $nhms 060000 1 "
fname2 "exit"

$BATCH_SUBCMD $blockflag -o $acqlog $fname
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif

Expand Down Expand Up @@ -1691,7 +1691,7 @@ exit 1
endif
fname2 "exit"

$BATCH_SUBCMD $blockflag -o $acqlog $fname
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif

Expand Down Expand Up @@ -1885,7 +1885,7 @@ exit 1
fname2 " acquire -v -rc aod4fcst.acq -s $spool -d . -strict $initref[1] $initref[2] 030000 2 "
fname2 "exit"

$BATCH_SUBCMD $blockflag -o $acqlog $fname
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif

Expand Down Expand Up @@ -2463,7 +2463,7 @@ exit 1
fname2 ""
fname2 "exit"

$BATCH_SUBCMD $blockflag -o $acqlog $fname
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname
sleep 2
@ cyc_sec = $TIMEINC * 60
set next_cycle = (`tick $rpl_nymdb $rpl_nhmsb $cyc_sec`)
Expand Down Expand Up @@ -2567,7 +2567,7 @@ exit 1
fname2 "acquire -v -rc obsys.acq -s $spool -d $FVWORK -ssh $strict $bnymd $bnhms $inhms 4"
fname2 "exit"

$BATCH_SUBCMD $blockflag -o $acqlog $fname
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname
sleep 2
set bnymd=`tick $bnymd`
end
Expand Down Expand Up @@ -2733,7 +2733,7 @@ exit 1
set obsflag = 1
set acqflags = "-d $FVWORK -s $spool -strict"
set acqflags1 = "-d $FVWORK -s $spool $strict"
set qblock = $blockflag
set qblock = $BLOCKFLAG
endif

# Check for available AOD obs classes
Expand Down Expand Up @@ -4113,7 +4113,7 @@ endif
"Central AGCM Failed "

if ( -e agcm_central.j ) then
$BATCH_SUBCMD $blockflag agcm_central.j
$BATCH_SUBCMD $BLOCKFLAG agcm_central.j
else
echo " ${MYNAME}: AGCM Failed to generate PBS jobs for Central, Aborting ... "
exit(1)
Expand Down Expand Up @@ -4393,7 +4393,7 @@ endif
# submit job and save job ID
#---------------------------
if ( $AODBLOCKJOB ) then
set jobIDline = (`$PBS_BIN/$BATCH_SUBCMD $blockflag -o $gaasLOG $jobf`)
set jobIDline = (`$PBS_BIN/$BATCH_SUBCMD $BLOCKFLAG -o $gaasLOG $jobf`)
else
set jobIDline = (`$PBS_BIN/$BATCH_SUBCMD -o $gaasLOG $jobf`)
endif
Expand Down Expand Up @@ -4789,7 +4789,7 @@ endif
fname2 " acquire_obsys -v -d $FVWORK $strict $anadate[1] $anadate[2] 060000 1 $tcvitals_class"
fname2 "exit"

$BATCH_SUBCMD $blockflag -o $acqlog $fname
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif
ls -lrt *vtx.prs* *vtx.mix*
Expand Down
14 changes: 9 additions & 5 deletions src/Applications/GEOSdas_App/fvsetup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ my ($acqloc);
my ($fcstimes,$fcswait_hrs,$asnwait_hrs);
my ($landbcs);
my ($coupled, $ores, $mometc);
my ($o_servers);
my ($o_servers,$bckend_wrts);

my ($sysfile, $nodeflg);
my (@rmTilde);
Expand Down Expand Up @@ -4735,6 +4735,7 @@ EOF
$ny_pert = 6 * $nx_pert;
$use_shmem = 0;
$o_servers = 0;
$bckend_wrts = 0;
$ios_nds = 1;
$cldmicro = "1MOMENT";
if ( "$res" eq "c" && "$vres" eq "55" ) {
Expand Down Expand Up @@ -5008,7 +5009,8 @@ EOF
$ana_jm_ens = $ana_jm;
} elsif ( "$res" eq "C180" ) { # Cubed-sphere
if ($geosit) {
$o_servers = 0; # 10; this does not payoff for C180 resolution
$o_servers = 3;
$bckend_wrts = 24;
}
$cubed = 1;
# $ios_nds = 2;
Expand Down Expand Up @@ -5079,7 +5081,7 @@ EOF
} elsif ( "$res" eq "C720" ) { # Cubed-sphere
$cubed = 1;
$o_servers = 8;
# $ios_nds = 3;
$bckend_wrts = 8;
$specres = "254";
$jcap = "254";
$agcm_grid_type = "Cubed-Sphere";
Expand Down Expand Up @@ -7671,6 +7673,7 @@ print SCRIPT <<"EOF";
setenv NCPUS_GPERT $ncpus_gpert # Number of CPUs to run gcmPERT
setenv NCPUS_AOD $ncpus_aod # Number of CPUs to run PSAS-AOD
setenv O_SERVERS $o_servers # Number of IO servers
setenv O_WRITERS_PER_NODE $bckend_wrts # Number of backend writers
#setenv GAAS_RUN_SLURM 1 # launch AOD analysis as separate batch job
setenv AODBLOCKJOB 1
EOF
Expand Down Expand Up @@ -8058,7 +8061,7 @@ print SCRIPT <<"EOF";
setenv RUN_OPT_BLEND "esma_mpirun -np \$NCPUS \$HDF2RSX"
if (\$G5GCM ) then
if ( \$O_SERVERS > 0 ) then
setenv RUN_OPT_BEGIN "mpirun -np \$NCPUSX \$GCMX --npes_model \$NCPUS --nodes_output_server \$O_SERVERS --oserver_type multigroup --npes_backend_pernode \$O_SERVERS"
setenv RUN_OPT_BEGIN "mpirun -np \$NCPUSX \$GCMX --npes_model \$NCPUS --nodes_output_server \$O_SERVERS --oserver_type multigroup --npes_backend_pernode \$O_WRITERS_PER_NODE"
else
setenv RUN_OPT_BEGIN "esma_mpirun -np \$NCPUS \$GCMX"
endif
Expand Down Expand Up @@ -8849,6 +8852,7 @@ print SCRIPT <<"EOF";
setenv NCPUS_GSI $ncpus_gsi # Numbers of CPUs to run GSI
setenv NCPUS_GPERT $ncpus_gpert # Numbers of CPUs to run GSI
setenv O_SERVERS $o_servers # Number of IO servers
setenv O_WRITERS_PER_NODE $bckend_wrts # Backend writers
setenv N_CPU \$NCPUS
setenv EXPID $expid # experiment ID
setenv CASE \$EXPID # experiment ID (for LSM's sake)
Expand Down Expand Up @@ -9249,7 +9253,7 @@ print SCRIPT <<"EOF";
setenv RUN_OPT_BLEND "esma_mpirun -np \$NCPUS \$HDF2RSX"
if (\$G5GCM ) then
if ( \$O_SERVERS > 0 ) then
setenv RUN_OPT_BEGIN "mpirun -np \$NCPUSX \$GCMX --npes_model \$NCPUS --nodes_output_server \$O_SERVERS --oserver_type multigroup --npes_backend_pernode \$O_SERVERS"
setenv RUN_OPT_BEGIN "mpirun -np \$NCPUSX \$GCMX --npes_model \$NCPUS --nodes_output_server \$O_SERVERS --oserver_type multigroup --npes_backend_pernode \$O_WRITERS_PER_NODE"
else
setenv RUN_OPT_BEGIN "esma_mpirun -np \$NCPUS \$GCMX"
endif
Expand Down

0 comments on commit 5b1a2a2

Please sign in to comment.