Skip to content

Commit

Permalink
Merge branch 'develop' into feature/karpob/omplp_g_rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@karpob
karpob committed Sep 2, 2022
2 parents 87fa097 + 408784c commit f315825
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 110 deletions.
10 changes: 5 additions & 5 deletions components.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ NCEP_Shared:
GMAO_Shared:
local: ./src/Shared/@GMAO_Shared
remote: ../GMAO_Shared.git
tag: rt1_4_10_geosit
tag: rt1_4_10_geosit5
develop: main

MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.8.0.7
tag: v2.8.0.9
develop: develop

FMS:
Expand All @@ -46,7 +46,7 @@ FMS:
GEOSana_GridComp:
local: ./src/Components/@GEOSana_GridComp
remote: ../GEOSana_GridComp.git
tag: v1.5.4.2
tag: v1.5.4.4
develop: develop

GEOSgcm_GridComp:
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_geosit
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_hist2
tag: rt1.5.6_geosit_hist5
develop: develop

UMD_Etc:
Expand Down
7 changes: 4 additions & 3 deletions src/Applications/GAAS_App/ana.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ ODS_files::

# Active data (Note: deep blue in MYD04 is passive)

#___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.asc.%y4%m2%d2_%h200z.ods
#___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.des.%y4%m2%d2_%h200z.ods
##___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.asc.%y4%m2%d2_%h200z.ods
##___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.des.%y4%m2%d2_%h200z.ods
#___AVHRR___${FVWORK}/patmosx.%y4%m2%d2_%h2z.ods

#___TERRA_NRT___${FVWORK}/${EXPID}.MOD04_L2a.land.%y4%m2%d2_%h200z.ods
#___TERRA_NRT___${FVWORK}/${EXPID}.MOD04_L2a.ocean.%y4%m2%d2_%h200z.ods
Expand All @@ -38,7 +39,7 @@ ODS_files::

#___MISR___${FVWORK}/misr_F12_0022.bright_tc8.obs.%y4%m2%d2.ods

#___AERONET___${FVWORK}/aeronet.obs.%y4%m2%d2.ods
#___AERONET___${FVWORK}/aeronet.obs.%y4%m2%d2_%h2z.ods

# Passive data
#/nobackup/3/PARASOL/Level2/ODS/Y%y4/M%m2/PARASOL_L2.aero_tc8.obs.%y4%m2%d2.ods
Expand Down
108 changes: 25 additions & 83 deletions src/Applications/GEOSdas_App/GEOSdas.csm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,19 @@
if ( !($?STRICT) ) setenv STRICT 0
if ( !($?TIMEINC) ) setenv TIMEINC 360
if ( !($?USE_ASCAT) ) setenv USE_ASCAT 0
if ( !($?USE_MODIS_STAGE) ) setenv USE_MODIS_STAGE 0
if ( !($?VAROFFSET) ) setenv VAROFFSET 180
if ( !($?VTRACK) ) setenv VTRACK 1
if ( !($?VTRKFRQA ) ) setenv VTRKFRQA 0
if ( !($?VTRKFRQF ) ) setenv VTRKFRQF 0
if ( !($?VTXRELOC ) ) setenv VTXRELOC 1
if ( !($?WCONSTRAINT) ) setenv WCONSTRAINT 0

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

if ( !($?doPLOTS) ) setenv doPLOTS 0
if ( !($?doFSENS) ) then
if ( -e stage4fsens.arc ) then
Expand Down Expand Up @@ -613,15 +618,6 @@ exit 1
cp -f AGCM.BOOTSTRAP.rc.tmpl AGCM.rc.tmpl
endif

# Turn off aerosol data sets for local acquire and replay
# -------------------------------------------------------
if ( $LOCAL_ACQUIRE ) then
set aerosol_acquire = 0
setenv USE_MODIS_STAGE 1
else
set aerosol_acquire = 1
endif

# If 4DVAR then link to adjoint nml file
# --------------------------------------
if (-e fvcorepert_layout_4dvar.rc) then
Expand Down Expand Up @@ -1557,11 +1553,7 @@ exit 1
fname2 " acquire -v -rc blend.acq -s $spool -d . -strict $nymd $nhms 060000 1 "
fname2 "exit"

if ( $BATCH_SUBCMD == "sbatch" ) then
sbatch -W -o $acqlog $fname
else
qsub -W block=true -o $acqlog $fname
endif
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif

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

if ( $BATCH_SUBCMD == "sbatch" ) then
sbatch -W -o $acqlog $fname
else
qsub -W block=true -o $acqlog $fname
endif
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif

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

if ( $BATCH_SUBCMD == "sbatch" ) then
sbatch -W -o $acqlog $fname
else
qsub -W block=true -o $acqlog $fname
endif
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif

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

if ( $BATCH_SUBCMD == "sbatch" ) then
sbatch -W -o $acqlog $fname
else
qsub -W block=true -o $acqlog $fname
endif
$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 @@ -2587,11 +2567,7 @@ exit 1
fname2 "acquire -v -rc obsys.acq -s $spool -d $FVWORK -ssh $strict $bnymd $bnhms $inhms 4"
fname2 "exit"

if ( $BATCH_SUBCMD == "sbatch" ) then
sbatch -W -o $acqlog $fname
else
qsub -W block=true -o $acqlog $fname
endif
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname
sleep 2
set bnymd=`tick $bnymd`
end
Expand Down Expand Up @@ -2637,7 +2613,7 @@ exit 1

# Acquire data for obsys on cmd line
# ----------------------------------
if ( (`uname -n` !~ borg*) || ( $LOCAL_ACQUIRE ) ) then
if ( `uname -n` !~ borg* ) then

# acquire tcvitals; ignore status return
#---------------------------------------
Expand Down Expand Up @@ -2751,17 +2727,13 @@ exit 1
set obsflag = 2
set acqflags = "-d $spool -s $spool -e 999"
set acqflags1 = "$acqflags"
set blockflag = ""
set qblock = ""
else
if ( !($?strict) ) set strict = ""
set obsflag = 1
set acqflags = "-d $FVWORK -s $spool -strict"
set acqflags1 = "-d $FVWORK -s $spool $strict"
if ( $BATCH_SUBCMD == "sbatch" ) then
set blockflag = "-W"
else
set blockflag = "-W block=true"
endif
set qblock = $BLOCKFLAG
endif

# Check for available AOD obs classes
Expand Down Expand Up @@ -2815,7 +2787,7 @@ exit 1
if ( $AOD_OBSCLASS == "" ) setenv AOD_OBSCLASS none
if ( $AOD_OBSCLASS == 0 ) setenv AOD_OBSCLASS none

if ($GAAS_ANA && $aerosol_acquire && ("$AOD_OBSCLASS" != "none")) then
if ($GAAS_ANA && ("$AOD_OBSCLASS" != "none")) then
@ mstep = $nstep * 2
fname2 acquire_obsys -v $acqflags -ssh -drc $AERO_OBSDBRC \\
fname2 " "$bnymd $bnhms 030000 $mstep \\
Expand Down Expand Up @@ -2847,7 +2819,12 @@ exit 1

# submit job script
#------------------
$BATCH_SUBCMD $blockflag -o $acqlog $fname # acquire observations; ignore status return
if ( $LOCAL_ACQUIRE ) then
chmod 744 $fname
$fname |& tee $acqlog
else
$BATCH_SUBCMD $qblock -o $acqlog $fname # acquire observations; ignore status return
endif
sleep 2
if ($obsflag == 1 && ( -e obsys.acq )) then
cat obsys.acq >>! obsys.acq.all
Expand Down Expand Up @@ -4136,11 +4113,7 @@ endif
"Central AGCM Failed "

if ( -e agcm_central.j ) then
if ( $BATCH_SUBCMD == "sbatch" ) then
sbatch -W agcm_central.j
else
qsub -W block=true agcm_central.j
endif
$BATCH_SUBCMD $BLOCKFLAG agcm_central.j
else
echo " ${MYNAME}: AGCM Failed to generate PBS jobs for Central, Aborting ... "
exit(1)
Expand Down Expand Up @@ -4278,22 +4251,6 @@ endif
/bin/cp $FVHOME/run/gaas/avhrr_l2a.pcf $AODWORK
/bin/cp $FVHOME/run/gaas/modis_l2a.pcf $AODWORK

# Reset value of MODIS_L2A_L2_DIR to $MODIS_STAGE_DIR?
# ---------------------------------------------------
if ($GAAS_ANA && $USE_MODIS_STAGE) then
if ( ! $?MODIS_STAGE_DIR ) then
echo "Error. MODIS_STAGE_DIR not defined"
echo "Aborting ... "
Call AbnormalExit_( 5 )
endif
if ( ! -d $MODIS_STAGE_DIR ) then
echo "Error. MODIS_STAGE_DIR directory not found: $MODIS_STAGE_DIR"
echo "Aborting ... "
Call AbnormalExit_( 5 )
endif
vED -i -vv MODIS_L2A_L2_DIR=$MODIS_STAGE_DIR $AODWORK/modis_l2a.pcf
endif

# Prepare ana.rc from template
# ----------------------------
set ana_rc_tmpl = $FVHOME/run/gaas/ana.rc.tmpl
Expand Down Expand Up @@ -4321,7 +4278,7 @@ endif
sed -i "s/#___AVHRR___//" $ana_rc
endif

if ($aod_obs == patmosx_asc) sed -i "s/#___AVHRR___//" $ana_rc
if ($aod_obs == patmosx_asc || $aod_obs == patmosx_ods) sed -i "s/#___AVHRR___//" $ana_rc
if ($aod_obs == aeronet_obs) sed -i "s/#___AERONET___//" $ana_rc
if ($aod_obs == misr_F12_bright) sed -i "s/#___MISR___//" $ana_rc
if ($aod_obs == mod04_land_nnr) sed -i "s/#___TERRA___//" $ana_rc
Expand All @@ -4340,12 +4297,6 @@ endif
endif
end

# if ($USE_MODIS_STAGE) then
# setenv MODIS_L2_HDF 1
# sed -i "s/#___AQUA_NRT___//" $ana_rc
# sed -i "s/#___TERRA_NRT___//" $ana_rc
# endif

echo "cat $ana_rc"
cat $ana_rc

Expand Down Expand Up @@ -4441,13 +4392,8 @@ endif

# submit job and save job ID
#---------------------------
if ( $BATCH_SUBCMD == "sbatch" ) then
set qblock = "-W"
else
set qblock = "-W block=true"
endif
if ( $AODBLOCKJOB ) then
set jobIDline = (`$PBS_BIN/$BATCH_SUBCMD $qblock -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 @@ -4843,11 +4789,7 @@ endif
fname2 " acquire_obsys -v -d $FVWORK $strict $anadate[1] $anadate[2] 060000 1 $tcvitals_class"
fname2 "exit"

if ( $BATCH_SUBCMD == "sbatch" ) then
sbatch -W -o $acqlog $fname
else
qsub -W block=true -o $acqlog $fname
endif
$BATCH_SUBCMD $BLOCKFLAG -o $acqlog $fname

endif
ls -lrt *vtx.prs* *vtx.mix*
Expand Down
Loading

0 comments on commit f315825

Please sign in to comment.