From b0196d7944b3532745be67a7deb260c8f05637b0 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Tue, 23 Aug 2022 05:30:05 -0400 Subject: [PATCH 1/3] setting for geosit; revised o_writers --- src/Applications/GEOSdas_App/fvsetup | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Applications/GEOSdas_App/fvsetup b/src/Applications/GEOSdas_App/fvsetup index 94684b3f..3f0f796d 100755 --- a/src/Applications/GEOSdas_App/fvsetup +++ b/src/Applications/GEOSdas_App/fvsetup @@ -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); @@ -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" ) { @@ -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; @@ -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"; @@ -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 @@ -8063,7 +8066,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 @@ -8854,6 +8857,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) @@ -9254,7 +9258,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 From 0d1dce59e7a821a31df6a63ca9a17f8da54eee73 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Tue, 23 Aug 2022 14:11:52 -0400 Subject: [PATCH 2/3] latest repo updates --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index ccc3b531..6fb642db 100644 --- a/components.yaml +++ b/components.yaml @@ -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: @@ -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 @@ -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: From 0732926038bdd30feba2562126a10bcae26e1b0f Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Tue, 23 Aug 2022 14:47:25 -0400 Subject: [PATCH 3/3] minor caps of env var name --- src/Applications/GEOSdas_App/GEOSdas.csm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Applications/GEOSdas_App/GEOSdas.csm b/src/Applications/GEOSdas_App/GEOSdas.csm index 40cc0a07..a377d4a1 100755 --- a/src/Applications/GEOSdas_App/GEOSdas.csm +++ b/src/Applications/GEOSdas_App/GEOSdas.csm @@ -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 @@ -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 @@ -1691,7 +1691,7 @@ exit 1 endif fname2 "exit" - $BATCH_SUBCMD $blockflag -o $acqlog $fname + $BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname endif @@ -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 @@ -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`) @@ -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 @@ -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 @@ -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) @@ -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 @@ -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*