Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
work in progress
  • Loading branch information
EdwardSafford-NOAA committed Apr 25, 2022
1 parent 9f81462 commit 78972c1
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 23 deletions.
19 changes: 15 additions & 4 deletions util/Radiance_Monitor/image_gen/src/radmon_ig_angle.fd/angle.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,12 @@ program angle
call avgsdv( t_cnt( ftyp,cyc,chan,rgn ), &
t_mean ( ftyp,cyc,chan,rgn,1 ), &
t_mean ( ftyp,cyc,chan,rgn,2 ), rmiss )
if( cyc == 1 .and. rgn == 1 .and. chan == 1 ) then
write(6,*)'ftyp,cyc,chan,rgn = ',ftyp,cyc,chan,rgn
write(6,*)'t_cnt, t_mean, sdv = ',t_cnt(ftyp,cyc,chan,rgn), &
t_mean(ftyp,cyc,chan,rgn,1),t_mean(ftyp,cyc,chan,rgn,2)
end if

call avgsdv( t_cnt( ftyp,cyc,chan,rgn ), &
t_scangl ( ftyp,cyc,chan,rgn,1 ), &
t_scangl ( ftyp,cyc,chan,rgn,2 ), rmiss )
Expand Down Expand Up @@ -1480,10 +1486,10 @@ program angle
!**********************************
! write results to time.txt files
!**********************************
82 FORMAT(A10,',',A10,',',F9.3,',',F9.3,',',F9.3,',',F9.3,',',F9.3,',' &
,F9.3,',',F9.3,',',F9.3,',',F9.3,',',F9.3,',' &
,F9.3,',',F9.3,',',F9.3,',',F9.3,',',F9.3,',' &
,F9.3,',',F9.3,',',F9.3,',',F9.3,',',F9.3,',')
82 FORMAT(A10,',',A10,',',F12.6,',',F12.6,',',F12.6,',',F12.6,',',F12.6,',' &
,F12.6,',',F12.6,',',F12.6,',',F12.6,',',F12.6,',' &
,F12.6,',',F12.6,',',F12.6,',',F12.6,',',F12.6,',' &
,F12.6,',',F12.6,',',F12.6,',',F12.6,',',F12.6,',')

do chan=1,nchanl

Expand Down Expand Up @@ -1622,6 +1628,11 @@ program angle
write(6,*)' mean_out_file opened, status: ', open_status

do cyc=1,ncycle
if( cyc == 1 .and. chan == 1 ) then
write(6,*)'AT OUTPUT: ftyp,cyc,chan,rgn = ',ges,cyc,chan,1
write(6,*)'t_mean, sdv = ', &
t_mean(ges,cyc,chan,1,1),t_mean(ges,cyc,chan,1,2)
end if
write(lsatout,82) trim(str_nchanl), trim(times(cyc)), &
t_mean(ges,cyc,chan,1,avg), t_mean(ges,cyc,chan,2,avg), &
t_mean(ges,cyc,chan,3,avg), t_mean(ges,cyc,chan,4,avg), &
Expand Down
33 changes: 18 additions & 15 deletions util/Radiance_Monitor/image_gen/ush/RadMon_IG_glb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -269,27 +269,28 @@ for test in ${test_list}; do
fi
done

export SATYPE=${satype}
#export SATYPE=${satype}
export SATYPE=abi_g16
echo $SATYPE


#------------------------------------------------------------------
# Start plot scripts.
#------------------------------------------------------------------
${IG_SCRIPTS}/mk_time_plots.sh
#${IG_SCRIPTS}/mk_time_plots.sh

${IG_SCRIPTS}/mk_bcoef_plots.sh
#${IG_SCRIPTS}/mk_bcoef_plots.sh

${IG_SCRIPTS}/mk_angle_plots.sh

if [[ ${PLOT_STATIC_IMGS} -eq 1 ]]; then
${IG_SCRIPTS}/mk_bcor_plots.sh
fi
#if [[ ${PLOT_STATIC_IMGS} -eq 1 ]]; then
# ${IG_SCRIPTS}/mk_bcor_plots.sh
#fi

#--------------------------------------------------------------------
# Check for log file and extract data for error report there
#--------------------------------------------------------------------
if [[ $DO_DATA_RPT -eq 1 ]]; then
if [[ $DO_DATA_RPT -eq 10 ]]; then

warn_file=${TANKverf}/${RUN}.${PDY}/${CYC}/${MONITOR}/warning.${PDATE}
if [[ -e ${warn_file} ]]; then
Expand All @@ -302,16 +303,16 @@ fi
#--------------------------------------------------------------------
# Update the last_plot_time file if found
#--------------------------------------------------------------------
if [[ -e ${last_plot_time} ]]; then
echo "update last_plot_time file"
echo ${PDATE} > ${last_plot_time}
fi
#if [[ -e ${last_plot_time} ]]; then
# echo "update last_plot_time file"
# echo ${PDATE} > ${last_plot_time}
#fi


#--------------------------------------------------------------------
# Remove all but the last 30 cycles worth of data image files.
#--------------------------------------------------------------------
${IG_SCRIPTS}/rm_img_files.pl --dir ${TANKimg}/pngs --nfl 30
#${IG_SCRIPTS}/rm_img_files.pl --dir ${TANKimg}/pngs --nfl 30



Expand All @@ -321,7 +322,7 @@ ${IG_SCRIPTS}/rm_img_files.pl --dir ${TANKimg}/pngs --nfl 30
# None: The $run_time is a one-hour delay to the Transfer job
# to ensure the plots are all finished prior to transfer.
#----------------------------------------------------------------------
if [[ $RUN_TRANSFER -eq 1 ]]; then
if [[ $RUN_TRANSFER -eq 10 ]]; then

if [[ $MY_MACHINE = "wcoss_c" || $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "wcoss2" ]]; then
cmin=`date +%M` # minute (MM)
Expand Down Expand Up @@ -352,11 +353,13 @@ if [[ $RUN_TRANSFER -eq 1 ]]; then
chmod 755 $cmdfile

run_time="$rhr$cmin" # HHMM format for qsub
$SUB -q $transfer_queue -A $ACCOUNT -o ${transfer_log} -e ${LOGdir}/Transfer_${RADMON_SUFFIX}.err \
$SUB -q $transfer_queue -A $ACCOUNT -o ${transfer_log} \
-e ${LOGdir}/Transfer_${RADMON_SUFFIX}.err \
-V -l select=1:mem=500M -l walltime=45:00 -N ${jobname} -a ${run_time} ${cmdfile}
else
$SUB -P $PROJECT -q $transfer_queue -o ${transfer_log} -M 80 -W 0:45 \
-R affinity[core] -J ${jobname} -cwd ${PWD} -b $run_time ${job}
-R affinity[core] -J ${jobname} -cwd ${PWD} ${job}
# -R affinity[core] -J ${jobname} -cwd ${PWD} -b $run_time ${job}
fi

fi
Expand Down
8 changes: 4 additions & 4 deletions util/Radiance_Monitor/image_gen/ush/plot_angle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ fi
#--------------------------------------------------------------------
# Clean $wrkdir
#
echo Removing wrkdir = $wrkdir
cd $wrkdir
cd ../
rm -rf $wrkdir
#echo Removing wrkdir = $wrkdir
#cd $wrkdir
#cd ../
#rm -rf $wrkdir

exit

0 comments on commit 78972c1

Please sign in to comment.