From 3052902bc65ca033ad038ac3c387caec1cab59e3 Mon Sep 17 00:00:00 2001 From: "Edward.Safford" Date: Tue, 20 Dec 2022 17:06:16 +0000 Subject: [PATCH] Ref #28 Rm debug statements. --- .../data_extract/ush/ConMon_DE.sh | 7 -- .../image_gen/gscripts/defint.gs | 6 +- .../image_gen/gscripts/plot_qsfc_horz.gs | 8 +- .../image_gen/gscripts/plot_uvallev_horz.gs | 2 - .../image_gen/gscripts/plot_uvsatwind_horz.gs | 2 - .../image_gen/gscripts/plotstas_time_bias.gs | 35 ++---- .../image_gen/gscripts/plotstas_time_bias2.gs | 36 ++---- .../gscripts/plotstas_time_bias2_ps.gs | 16 --- .../{unused => }/plotstas_time_bias_ps.gs | 42 +++---- .../image_gen/gscripts/plotstas_time_count.gs | 38 ++---- .../gscripts/plotstas_time_count_ps.gs | 34 +----- .../image_gen/gscripts/plotstas_vert_bias.gs | 11 +- .../image_gen/gscripts/plotstas_vert_count.gs | 24 +--- .../image_gen/ush/ConMon_IG.sh | 3 +- .../image_gen/ush/mk_horz_hist.sh | 12 +- .../image_gen/ush/mk_time_vert.sh | 6 +- .../image_gen/ush/plot_hist.sh | 60 +++++----- .../image_gen/ush/plot_horz.sh | 92 +++++++++------ .../image_gen/ush/plot_horz_uv.sh | 108 ++++++++++-------- .../image_gen/ush/plot_time.sh | 22 ++-- .../image_gen/ush/plot_time_ps.sh | 38 +++--- .../image_gen/ush/plot_vert.sh | 11 +- .../image_gen/ush/rm_img_files.pl | 10 +- src/Conventional_Monitor/parm/ConMon_config | 4 +- 24 files changed, 255 insertions(+), 372 deletions(-) rename src/Conventional_Monitor/image_gen/gscripts/{unused => }/plotstas_time_bias_ps.gs (85%) diff --git a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh index 461add5b..af5210cd 100755 --- a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh +++ b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh @@ -106,7 +106,6 @@ jobname=ConMon_DE_${CONMON_SUFFIX} echo "C_TANKDIR = ${C_TANKDIR}" echo "C_LOGDIR = ${C_LOGDIR}" echo "C_IMGNDIR = ${C_IMGNDIR}" -echo "MON_USH = $MON_USH" if [[ ! -d ${C_TANKDIR} ]]; then mkdir -p ${C_TANKDIR} @@ -141,8 +140,6 @@ if [[ ${#cnvstat_location} -le 0 ]]; then export cnvstat_location=${COMROOT}/gfs/${gfs_ver} fi export CNVSTAT_LOCATION=${cnvstat_location} -echo "CNVSTAT_LOCATION = $CNVSTAT_LOCATION" - export COMPONENT=${COMPONENT:-atmos} export C_DATDIR=${C_DATDIR:-${CNVSTAT_LOCATION}/${RUN}.${PDY}/${CYC}/${COMPONENT}} @@ -181,10 +178,6 @@ if [[ ! -s ${pgrbf06} ]]; then export pgrbf06="${C_GDATDIR}/gdas.t${GCYC}z.pgrb2.1p00.f006" fi -echo "cnvstat = $cnvstat" -echo "pgrbf00 = $pgrbf00" -echo "pgrbf06 = $pgrbf06" - #--------------------------------------------- # override the default convinfo definition diff --git a/src/Conventional_Monitor/image_gen/gscripts/defint.gs b/src/Conventional_Monitor/image_gen/gscripts/defint.gs index 20a3506d..2bb7a6b9 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/defint.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/defint.gs @@ -28,12 +28,8 @@ while(i <= 6) endif i=i+1 endwhile -say line + line -*say 'set ccols 49 47 45 44 43 42 99 22 23 24 25 27 29' -*'set ccols 49 47 45 44 43 42 99 22 23 24 25 27 29' -say 'set ccols 9 14 4 11 5 3 99 7 12 8 2 25 29' 'set ccols 9 14 4 11 5 3 99 7 12 8 2 27 6' -*exit 0 return endfile diff --git a/src/Conventional_Monitor/image_gen/gscripts/plot_qsfc_horz.gs b/src/Conventional_Monitor/image_gen/gscripts/plot_qsfc_horz.gs index dcab4f0c..cc220f85 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plot_qsfc_horz.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plot_qsfc_horz.gs @@ -49,7 +49,7 @@ dbug=0 setmap(plotfile,he) 'set gxout shaded' 'defint.gs 0.5 0' -'d 10*(RH2m.1-RH2m.2)/RHprs.1' +'d 10*(RHprs.1-RHprs.2)/RHprs.1' 'colorbar.gs' 'set ccolor 6' 'set digsiz 0.12' @@ -63,7 +63,7 @@ setmap(plotfile,he) setmap(plotfile,he) 'set gxout shaded' 'defint.gs 0.5 0' -'d 10*(RH2m.1-RH2m.2)/RHprs.1' +'d 10*(RHprs.1-RHprs.2)/RHprs.1' 'colorbar.gs' 'set ccolor 6' 'set digsiz 0.12' @@ -77,7 +77,7 @@ setmap(plotfile,he) setmap(plotfile,he) 'set gxout shaded' 'defint.gs 0.5 0' -'d 10*(RH2m.1-RH2m.2)/RHprs.1' +'d 10*(RHprs.1-RHprs.2)/RHprs.1' 'colorbar.gs' 'set ccolor 98' 'draw title Humidity INCT*10/Anal at 'rdate'z' @@ -86,7 +86,7 @@ setmap(plotfile,he) setmap(plotfile,he) 'set gxout shaded' 'defint 10 50' -'d RH2m.1' +'d RHprs.1' 'colorbar.gs' 'draw title Surface Humidity Analysis(RH,%) at 'rdate'z' if(dbug=1) diff --git a/src/Conventional_Monitor/image_gen/gscripts/plot_uvallev_horz.gs b/src/Conventional_Monitor/image_gen/gscripts/plot_uvallev_horz.gs index 1ece1f09..a47c7dee 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plot_uvallev_horz.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plot_uvallev_horz.gs @@ -88,8 +88,6 @@ function plot_horz(plotfile,plotfile2,xsize,ysize,he,rdate,levx,levx1,hint,var) 'set digsiz 0.12' levy=levx-hint ley1=levx+hint+1 - say 'levy='levy - say 'ley1='ley1 'set lev 'levy 'set dfile 4' 'set lev 'levy diff --git a/src/Conventional_Monitor/image_gen/gscripts/plot_uvsatwind_horz.gs b/src/Conventional_Monitor/image_gen/gscripts/plot_uvsatwind_horz.gs index eca9765d..5fc857ca 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plot_uvsatwind_horz.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plot_uvsatwind_horz.gs @@ -135,8 +135,6 @@ function plot_horz(plotfile,plotfile2,xsize,ysize,he,rdate,levx,levx1,hint,var) 'set digsiz 0.12' levy=levx-hint ley1=levx+hint+1 - say 'levy='levy - say 'ley1='ley1 'set lev 'levy 'set dfile 4' 'set lev 'levy diff --git a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias.gs index 94af7555..359f5938 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias.gs @@ -14,7 +14,6 @@ function time_bias (args) 'q time' dmy=sublin(result,1) ti=subwrd(dmy,5) - say ti hh=substr(ti,1,2) dd=substr(ti,4,2) @@ -23,13 +22,10 @@ function time_bias (args) ixc=subwrd(size,3) iyc=subwrd(size,6) izc=subwrd(size,9) - say ixc - say 'iyc=' iyc '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' rest=read(rest.txt) restrict=subwrd(rest,2) - say 'restrict=' restrict ix=1 while(ix <=ixc) @@ -46,6 +42,16 @@ function time_bias (args) endif result=close(info.txt) +* Avoid plotting stypes "uv235" and "all". Stype all is included in the ctl file (from +* which the stypes are taken) but the web site has never included all stypes, so +* eliminating plotting them is a space/time savings. Stype 235 (uv only) produces +* missing data errors on half the plots -- the upper half. This will be +* investigated in a separate fix. + if ( stype = 235 | stype = all ) + ix=ix+1 + continue + endif + iy=1 while(iy <=iyc) @@ -57,7 +63,6 @@ function time_bias (args) endif endif - say 'iy=' iy '!rm -f area.txt' if ( iy <10) @@ -74,7 +79,6 @@ function time_bias (args) area=substr(info,14,25) endif result=close(area.txt) - say 'area = 'area iz=1 while(iz <=izc) @@ -130,22 +134,17 @@ endfile function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,dtype,levz,debug) - 'page' 'clear' nfield=4 field.1.1=bias1.1 field.1.2=bias1.2 - field.1.3=bias1.3 field.2.1=rms1.1 field.2.2=rms1.2 - field.2.3=rms1.3 field.3.1=bias3.1 field.3.2=bias3.2 - field.3.3=bias3.3 field.4.1=rms3.1 field.4.2=rms3.2 - field.4.3=rms3.3 title.1="o-g(used)" title.2="rms(used)" @@ -162,9 +161,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,dtype,levz,debug) y1=10.6-(nf-1)*2.5 y2=y1-1.8 ystring=y1+0.1 - say ' y1='y1 - say ' y2='y2 - say ' ystring='ystring 'set t 1 last' 'query time' dmy=sublin(result,1) @@ -188,14 +184,10 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,dtype,levz,debug) if(maxvar1 > maxvar) maxvar=maxvar1 endif - say ' 'minvar - say ' 'maxvar yrange=maxvar-minvar dy=0.1*yrange minvar=minvar-dy maxvar=maxvar+dy - say ' 'minvar - say ' 'maxvar 'set parea 1.0 8.0 'y2' 'y1 'set gxout line' 'set t 1 last' @@ -205,8 +197,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,dtype,levz,debug) 'set y 'iy 'set x 'ix 'set z 'iz -* 'set axlim 'minvar' 'maxvar -* 'set yaxis 'minvar' 'maxvar' 'dy 'set vrange 'minvar' 'maxvar 'set ccolor 1' 'set cmark 0' @@ -215,9 +205,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,dtype,levz,debug) 'set cmark 1' 'd 'field.nf.2 'set ccolor 3' -* 'set cmark 2' -* 'd 'field.nf.3 -* if(iuse = 1);datause='assimilated';endif if(iuse = -1) datause='mon.' else @@ -231,8 +218,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,dtype,levz,debug) 'set line 2 1' 'draw line 3.1 0.6 3.4 0.6' 'draw string 3.5 0.55 final outloop' -* 'set line 3 1' -* 'draw line 5.1 0.6 5.4 0.6' 'draw string 5.5 0.55 'fti'-'ti nf=nf+1 endwhile diff --git a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2.gs index 4e266831..79f1e9b7 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2.gs @@ -7,7 +7,6 @@ function plot_bias2 (args) dtype=DTYPE 'open ges_'dtype'_stas.ctl' 'open anl_'dtype'_stas.ctl' -* 'open 'dtype'_stas_int.ctl' 'set grads off' debug=0 @@ -15,7 +14,6 @@ function plot_bias2 (args) 'q time' dmy=sublin(result,1) ti=subwrd(dmy,5) - say ti hh=substr(ti,1,2) dd=substr(ti,4,2) @@ -24,8 +22,6 @@ function plot_bias2 (args) ixc=subwrd(size,3) iyc=subwrd(size,6) izc=subwrd(size,9) - say ixc - say 'iyc=' iyc iz=1 while(iz <=izc) @@ -63,7 +59,6 @@ function plot_bias2 (args) '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' rest=read(rest.txt) restrict=subwrd(rest,2) - say 'restrict=' restrict iy=1 while(iy <=iyc) @@ -76,7 +71,6 @@ function plot_bias2 (args) endif endif - say 'iy=' iy '!rm -f area.txt' '!cat ges_'dtype'_stas.ctl |grep "region= 'iy' " > area.txt' result=read(area.txt) @@ -87,7 +81,6 @@ function plot_bias2 (args) area=substr(info,14,25) endif result=close(area.txt) - say 'area = 'area ix=1 while(ix <=ixc) @@ -105,6 +98,16 @@ function plot_bias2 (args) endif result=close(info.txt) +* Avoid plotting syptes "uv235" and "all". Stype all is included in the ctl file (from +* which the stypes are taken) but the web site has never included all stypes, so +* eliminating plotting them is a space/time savings. Stype 235 (uv only) produces +* missing data errors on half the plots -- the upper half. This will be +* investigated in a separate fix. + if ( stype = 235 | stype = all ) + ix=ix+1 + continue + endif + plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) ix=ix+1 @@ -122,25 +125,20 @@ endfile function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) - 'page' 'clear' nfield=4 field.1.1=bias2.1 field.1.2=bias2.2 - field.1.3=bias2.3 field.2.1=rms2.1 field.2.2=rms2.2 - field.2.3=rms2.3 field.3.1=bias3.1 field.3.2=bias3.2 - field.3.3=bias3.3 field.4.1=rms3.1 field.4.2=rms3.2 - field.4.3=rms3.3 title.1="o-g for rej. by GC " title.2="rms for rej. by GC" @@ -157,9 +155,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) y1=10.6-(nf-1)*2.5 y2=y1-1.8 ystring=y1+0.1 - say ' y1='y1 - say ' y2='y2 - say ' ystring='ystring 'set t 1 last' 'query time' dmy=sublin(result,1) @@ -186,14 +181,10 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) maxvar=maxvar1 endif - say ' 'minvar - say ' 'maxvar yrange=maxvar-minvar dy=0.1*yrange minvar=minvar-dy maxvar=maxvar+dy - say ' 'minvar - say ' 'maxvar 'set parea 1.0 8.0 'y2' 'y1 'set gxout line' 'set t 1 last' @@ -203,8 +194,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) 'set y 'iy 'set x 'ix 'set z 'iz -* 'set axlim 'minvar' 'maxvar -* 'set yaxis 'minvar' 'maxvar' 'dy 'set vrange 'minvar' 'maxvar 'set ccolor 1' 'set cmark 0' @@ -213,9 +202,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) 'set cmark 1' 'd 'field.nf.2 'set ccolor 3' -* 'set cmark 2' -* 'd 'field.nf.3 -* if(iuse = 1);datause='assimilated';endif if(iuse = -1) datause='mon.' else @@ -229,8 +215,6 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) 'set line 2 1' 'draw line 3.1 0.6 3.4 0.6' 'draw string 3.5 0.55 final outloop' - 'set line 3 1' -* 'draw line 5.1 0.6 5.4 0.6' 'draw string 5.5 0.55 'fti'-'ti nf=nf+1 endwhile diff --git a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2_ps.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2_ps.gs index 121f9845..9673fe58 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2_ps.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias2_ps.gs @@ -14,7 +14,6 @@ function time_bias2_ps (args) 'q time' dmy=sublin(result,1) ti=subwrd(dmy,5) - say ti hh=substr(ti,1,2) dd=substr(ti,4,2) @@ -22,13 +21,10 @@ function time_bias2_ps (args) size=sublin(result,5) ixc=subwrd(size,3) iyc=subwrd(size,6) - say ixc - say 'iyc=' iyc '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' rest=read(rest.txt) restrict=subwrd(rest,2) - say 'restrict=' restrict iy=1 while(iy <=iyc) @@ -41,7 +37,6 @@ function time_bias2_ps (args) endif endif - say 'iy=' iy '!rm -f area.txt' '!cat ges_ps_stas.ctl |grep "region= 'iy' " > area.txt' result=read(area.txt) @@ -88,16 +83,12 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) nfield=4 field.1.1=bias2.1 field.1.2=bias2.2 - field.1.3=bias2.3 field.2.1=rms2.1 field.2.2=rms2.2 - field.2.3=rms2.3 field.3.1=bias3.1 field.3.2=bias3.2 - field.3.3=bias3.3 field.4.1=rms3.1 field.4.2=rms3.2 - field.4.3=rms3.3 title.1="o-g for rej. by GC" title.2="rms for rej. by GC" @@ -114,9 +105,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) y1=10.6-(nf-1)*2.5 y2=y1-1.8 ystring=y1+0.1 - say ' y1='y1 - say ' y2='y2 - say ' ystring='ystring 'set t 1 last' 'query time' 'set y 'iy @@ -140,14 +128,10 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) maxvar=maxvar1 endif - say ' 'minvar - say ' 'maxvar yrange=maxvar-minvar dy=0.1*yrange minvar=minvar-dy maxvar=maxvar+dy - say ' 'minvar - say ' 'maxvar 'set parea 1.0 8.0 'y2' 'y1 'set gxout line' 'set t 1 last' diff --git a/src/Conventional_Monitor/image_gen/gscripts/unused/plotstas_time_bias_ps.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias_ps.gs similarity index 85% rename from src/Conventional_Monitor/image_gen/gscripts/unused/plotstas_time_bias_ps.gs rename to src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias_ps.gs index cd778b41..5aafd54d 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/unused/plotstas_time_bias_ps.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_bias_ps.gs @@ -7,7 +7,6 @@ function time_bias_ps (args) 'open ges_ps_stas.ctl' 'open anl_ps_stas.ctl' -* 'open ps_stas_int.ctl' 'set grads off' debug=0 @@ -15,7 +14,6 @@ function time_bias_ps (args) 'q time' dmy=sublin(result,1) ti=subwrd(dmy,5) - say ti hh=substr(ti,1,2) dd=substr(ti,4,2) @@ -23,13 +21,25 @@ function time_bias_ps (args) size=sublin(result,5) ixc=subwrd(size,3) iyc=subwrd(size,6) - say ixc - say 'iyc=' iyc + + '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' + rest=read(rest.txt) + restrict=subwrd(rest,2) iy=1 while(iy <=iyc) - say 'iy=' iy +* +* In order to save space skip regions N. Hemisphere(2), S. Hemisphere(3), and Canada(6) +* + if ( restrict = 1 ) + say 'restrict true 'restrict + if ( iy = 2 | iy = 3 | iy = 5 | iy = 6 ) + iy=iy+1 + continue + endif + endif + '!rm -f area.txt' if ( iy <10) '!cat ges_ps_stas.ctl |grep "region= 'iy' " > area.txt' @@ -47,11 +57,9 @@ function time_bias_ps (args) endif result=close(area.txt) -* say 'area = 'area ix=1 while(ix <=ixc) - '!rm -f info.txt' '!cat ges_ps_stas.ctl |grep "'ix' dtype=" > info.txt' result=read(info.txt) @@ -87,16 +95,12 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) nfield=4 field.1.1=bias1.1 field.1.2=bias1.2 - field.1.3=bias1.3 field.2.1=rms1.1 field.2.2=rms1.2 - field.2.3=rms1.3 field.3.1=bias3.1 field.3.2=bias3.2 - field.3.3=bias3.3 field.4.1=rms3.1 field.4.2=rms3.2 - field.4.3=rms3.3 title.1="o-g(used)" title.2="rms(used)" @@ -113,9 +117,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) y1=10.6-(nf-1)*2.5 y2=y1-1.8 ystring=y1+0.1 - say ' y1='y1 - say ' y2='y2 - say ' ystring='ystring 'set t 1 last' 'query time' dmy=sublin(result,1) @@ -139,14 +140,10 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) if(maxvar1 > maxvar) maxvar=maxvar1 endif - say ' 'minvar - say ' 'maxvar yrange=maxvar-minvar dy=0.1*yrange minvar=minvar-dy maxvar=maxvar+dy - say ' 'minvar - say ' 'maxvar 'set parea 1.0 8.0 'y2' 'y1 'set gxout line' 'set t 1 last' @@ -156,8 +153,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) 'set y 'iy 'set x 'ix 'set z 1' -* 'set axlim 'minvar' 'maxvar -* 'set yaxis 'minvar' 'maxvar' 'dy 'set vrange 'minvar' 'maxvar 'set ccolor 1' 'set cmark 0' @@ -166,11 +161,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) 'set cmark 1' 'd 'field.nf.2 -* 'set ccolor 3' -* 'set cmark 2' -* 'd 'field.nf.3 -* if(iuse = 1);datause='assimilated';endif - if(iuse = -1) datause='mon.' else @@ -185,8 +175,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) 'draw line 3.1 0.6 3.4 0.6' 'draw string 3.5 0.55 final outloop' -* 'set line 3 1' -* 'draw line 5.1 0.6 5.4 0.6' 'draw string 5.5 0.55 'fti'-'ti nf=nf+1 endwhile diff --git a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count.gs index 9e90eac4..f5bdcd6d 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count.gs @@ -15,7 +15,6 @@ function time_cnt_ps (args) 'q time' dmy=sublin(result,1) ti=subwrd(dmy,5) - say ti hh=substr(ti,1,2) dd=substr(ti,4,2) @@ -24,13 +23,10 @@ function time_cnt_ps (args) ixc=subwrd(size,3) iyc=subwrd(size,6) izc=subwrd(size,9) - say ixc - say 'iyc=' iyc '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' rest=read(rest.txt) restrict=subwrd(rest,2) - say 'restrict=' restrict ix=1 @@ -48,6 +44,17 @@ function time_cnt_ps (args) iuse=subwrd(info,10) endif result=close(info.txt) + +* Avoid plotting uv235 and all stypes. Stype all is included in the ctl file (from +* which the stypes are taken) but the web site has never included all stypes, so +* eliminating plotting them is a space/time savings. Stype 235 (uv only) produces +* missing data errors on half the plots -- the upper half. This will be +* investigated in a separate fix. + if ( stype = 235 | stype = all ) + ix=ix+1 + continue + endif + iy=1 while(iy <=iyc) @@ -60,7 +67,6 @@ function time_cnt_ps (args) endif endif - say 'iy=' iy '!rm -f area.txt' if ( iy <10) @@ -70,14 +76,13 @@ function time_cnt_ps (args) endif result=read(area.txt) rc=sublin(result,1) - area="uknown" + area="unknown" if (rc = 0) info=sublin(result,2) area=substr(info,14,25) endif result=close(area.txt) - say 'area = 'area iz=1 while(iz <=izc) @@ -158,16 +163,12 @@ function plottime(ix,iy,iz,dtype,hh,dd,area,stype,subtype,iuse,levz,debug) nfield=4 field.1.1=count1.1 field.1.2=count1.2 -field.1.3=count1.3 field.2.1=count_vqc1.1 field.2.2=count_vqc1.2 -field.2.3=count_vqc1.3 field.3.1=count2.1 field.3.2=count2.2 -field.3.3=count2.3 field.4.1=count3.1 field.4.2=count3.2 -field.4.3=count3.3 title.1="assi. no." title.2="no. rej. by VQC" @@ -179,9 +180,6 @@ while(nf <=nfield) y1=10.6-(nf-1)*2.5 y2=y1-1.8 ystring=y1+0.1 -say ' y1='y1 -say ' y2='y2 -say ' ystring='ystring 'set t 1' 'query time' @@ -211,14 +209,10 @@ ti=subwrd(dmy,5) if(maxvar1 > maxvar) maxvar=maxvar1 endif - say ' 'minvar - say ' 'maxvar yrange=maxvar-minvar dy=0.1*yrange minvar=minvar-dy maxvar=maxvar+dy - say ' 'minvar - say ' 'maxvar 'set parea 1.0 8.0 'y2' 'y1 'set gxout line' 'set t 1 last' @@ -228,8 +222,6 @@ ti=subwrd(dmy,5) 'set y 'iy 'set x 'ix 'set z 'iz -*'set axlim 'minvar' 'maxvar -*'set yaxis 'minvar' 'maxvar' 'dy 'set vrange 'minvar' 'maxvar 'set ccolor 1' 'set cmark 0' @@ -237,10 +229,6 @@ ti=subwrd(dmy,5) 'set ccolor 2' 'set cmark 1' 'd 'field.nf.2 -* 'set ccolor 3' -* 'set cmark 2' -* 'd 'field.nf.3 -* if(iuse = 1);datause='used';endif if(iuse = -1) datause='mon.' else @@ -255,8 +243,6 @@ ti=subwrd(dmy,5) 'set line 2 1' 'draw line 3.1 0.6 3.4 0.6' 'draw string 3.5 0.55 final outloop' -*'set line 3 1' -*'draw line 5.1 0.6 5.4 0.6' 'draw string 5.5 0.55 'fti'-'ti nf=nf+1 endwhile diff --git a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count_ps.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count_ps.gs index b26fdef2..0475c295 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count_ps.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_time_count_ps.gs @@ -6,10 +6,8 @@ function ps_time_count (args) -* 'reinit' 'open ges_ps_stas.ctl' 'open anl_ps_stas.ctl' -* 'open ps_stas_int.ctl' 'set grads off' debug=0 @@ -17,7 +15,6 @@ function ps_time_count (args) 'q time' dmy=sublin(result,1) ti=subwrd(dmy,5) - say ti hh=substr(ti,1,2) dd=substr(ti,4,2) @@ -25,13 +22,10 @@ function ps_time_count (args) size=sublin(result,5) ixc=subwrd(size,3) iyc=subwrd(size,6) - say ixc - say 'iyc=' iyc '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' rest=read(rest.txt) restrict=subwrd(rest,2) - say 'restrict=' restrict iy=1 while(iy <=iyc) @@ -44,7 +38,6 @@ function ps_time_count (args) endif endif - say 'iy=' iy '!rm -f area.txt' if( iy <10) @@ -60,7 +53,6 @@ function ps_time_count (args) area=substr(info,14,25) endif result=close(area.txt) - say 'area = 'area ix=1 while(ix <=ixc) @@ -70,8 +62,6 @@ function ps_time_count (args) result=read(info.txt) rc=sublin(result,1) iuse=0 - say 'dtype= 'dtype - say 'rc = 'rc if (rc = 0) info=sublin(result,2) @@ -79,9 +69,6 @@ function ps_time_count (args) subtype=subwrd(info,8) iuse=subwrd(info,10) endif - say 'stype = 'stype - say 'subtype = 'subtype - say 'iuse = 'iuse result=close(info.txt) plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) @@ -106,19 +93,15 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) nfield=4 field.1.1=count1.1 field.1.2=count1.2 -* field.1.3=count1.3 field.2.1=count_vqc1.1 field.2.2=count_vqc1.2 -* field.2.3=count_vqc1.3 field.3.1=count2.1 field.3.2=count2.2 -* field.3.3=count2.3 field.4.1=count3.1 field.4.2=count3.2 -* field.4.3=count3.3 title.1="ass. no." title.2="no. rej. by VQC" @@ -135,9 +118,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) y1=10.6-(nf-1)*2.5 y2=y1-1.8 ystring=y1+0.1 - say ' y1='y1 - say ' y2='y2 - say ' ystring='ystring 'set t 1 last' 'query time' dmy=sublin(result,1) @@ -165,14 +145,11 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) maxvar=maxvar1 endif - say ' 'minvar - say ' 'maxvar yrange=maxvar-minvar dy=0.1*yrange minvar=minvar-dy maxvar=maxvar+dy - say ' 'minvar - say ' 'maxvar + 'set parea 1.0 8.0 'y2' 'y1 'set gxout line' 'set t 1 last' @@ -183,8 +160,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) 'set x 'ix 'set z 1' -* 'set axlim 'minvar' 'maxvar -* 'set yaxis 'minvar' 'maxvar' 'dy 'set vrange 'minvar' 'maxvar 'set ccolor 1' @@ -195,11 +170,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) 'set cmark 1' 'd 'field.nf.2 -* 'set ccolor 3' -* 'set cmark 2' -* 'd 'field.nf.3 -* if(iuse = 1);datause='assimilated';endif - if(iuse = -1) datause='mon.' else @@ -213,8 +183,6 @@ function plottime(ix,iy,stype,hh,dd,area,stype,subtype,iuse,debug) 'set line 2 1' 'draw line 3.1 0.6 3.4 0.6' 'draw string 3.5 0.55 final outloop' -* 'set line 3 1' -* 'draw line 5.1 0.6 5.4 0.6' 'draw string 5.5 0.55 'fti'-'ti nf=nf+1 endwhile diff --git a/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_bias.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_bias.gs index 0f87bbea..9acc0935 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_bias.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_bias.gs @@ -20,7 +20,6 @@ function vert_bias (args) 'q time' ti=sublin(result,1) dmy=subwrd(ti,3) - say dmy hh=substr(dmy,1,2) dd=substr(dmy,4,2) @@ -34,7 +33,6 @@ function vert_bias (args) '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' rest=read(rest.txt) restrict=subwrd(rest,2) - say 'rs=' restrict iy=1 while(iy <=nyc) @@ -67,7 +65,6 @@ function vert_bias (args) else datause='used' endif - plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) ix=ix+1 @@ -110,7 +107,6 @@ function plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) yp=2 while(nf <=nfield) - say 'nf='nf 'run setvpage 'xp' 'yp' 2 2 0.9' 'set annot 98' 'set line 98' @@ -122,29 +118,24 @@ function plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) 'set t last' 'set x 'ix - say 'x='ix 'set y 'iy 'set z 1' 'define vmax=max('field.nf.1',z=2,z='nzc')' 'define vmin=min('field.nf.1',z=2,z='nzc')' 'd vmax' - say result cmax=subwrd(result,4) if(cmax=0); cmax=0.1;endif 'd vmin' - say result cmin=subwrd(result,4) if(cmin=0);cmin=-0.1;endif yrange=cmax-cmin - say 'cmax='cmax dy=0.1*yrange cmax=cmax+dy cmin=cmin-dy - say 'cmax='cmax 'set z 2 'nzc 'set vrange 'cmin' 'cmax 'set ccolor 98' @@ -163,7 +154,7 @@ function plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) outfile=dtype''stype'-'subtype'_bias_vert_region'iy'.png' - 'printim 'outfile' x800 y650 white' + 'printim 'outfile' x800 y650' if(debug=1) say 'enter' pull diff --git a/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_count.gs b/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_count.gs index 64a73bf8..5e10a7cd 100644 --- a/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_count.gs +++ b/src/Conventional_Monitor/image_gen/gscripts/plotstas_vert_count.gs @@ -19,7 +19,6 @@ function vert_count (args) 'q time' ti=sublin(result,1) dmy=subwrd(ti,3) - say dmy hh=substr(dmy,1,2) dd=substr(dmy,4,2) @@ -33,7 +32,6 @@ function vert_count (args) '!echo $CONMON_RESTRICT_PLOT_AREAS > rest.txt' rest=read(rest.txt) restrict=subwrd(rest,2) - say 'rs=' restrict iy=1 while(iy <=nyc) @@ -85,16 +83,12 @@ function plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) field.1.1=count1.1 field.1.2=count1.2 - field.1.3=count1.3 field.2.1=count_vqc1.1 field.2.2=count_vqc1.2 - field.2.3=count_vqc1.3 field.3.1=count2.1 field.3.2=count2.2 - field.3.3=count2.3 field.4.1=count3.1 field.4.2=count3.2 - field.4.3=count3.3 title.1="no assi." title.2="no rej. by VQC" @@ -107,8 +101,6 @@ function plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) yp=2 while(nf <=nfield) - say 'nf='nf - 'run setvpage 'xp' 'yp' 2 2 0.9' 'set annot 98' 'set line 98' @@ -118,33 +110,19 @@ function plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) 'set datawarn off' 'set t last' 'set x 'ix - say 'x='ix 'set y 'iy 'set z 1' 'define vmax=max('field.nf.1',z=2,z='nzc')' 'd vmax' - say result cmax=subwrd(result,4) - say 'cmax='cmax - -* if(cmax <1.0) -* iy=iy+1 -* 'page' -* 'clear' -* say "continue " ix " " iy -* continue -* endif cmax=cmax+10 - say 'cmax='cmax 'set z 2 'nzc 'set vrange 0 'cmax 'set ccolor 98' 'd 'field.nf.1 'set ccolor 2' 'd 'field.nf.2 -* 'set ccolor 3' -* 'd 'field.nf.2 'draw title 'dtype''stype'-'subtype'('datause'):'title.nf' on 'dmy if( nf =2 );xp=xp+1;endif; @@ -156,7 +134,7 @@ function plot_vert(ix,iy,nzc,dmy,dtype,stype,subtype,datause,iuse,debug) outfile=dtype''stype'-'subtype'_count_vert_region'iy'.png' - 'printim 'outfile' x800 y650 white' + 'printim 'outfile' x800 y650' if(debug=1) say 'enter' pull diff --git a/src/Conventional_Monitor/image_gen/ush/ConMon_IG.sh b/src/Conventional_Monitor/image_gen/ush/ConMon_IG.sh index 9ecda11b..1508627b 100755 --- a/src/Conventional_Monitor/image_gen/ush/ConMon_IG.sh +++ b/src/Conventional_Monitor/image_gen/ush/ConMon_IG.sh @@ -109,6 +109,7 @@ else exit 3 fi +module list #-------------------------------------------------------------------- # Create LOGdir as needed @@ -175,7 +176,7 @@ if [[ $PDATE -le ${last_cycle} ]]; then #-------------------------------------------------------------------- # Create workdir and cd to it #-------------------------------------------------------------------- - export C_PLOT_WORKDIR=${C_PLOT_WORKDIR:-${C_STMP_USER}/${CONMON_SUFFIX}/${RUN}/conmon} + export C_PLOT_WORKDIR=${C_PLOT_WORKDIR:-${MON_STMP}/${CONMON_SUFFIX}/${RUN}/conmon} rm -rf $C_PLOT_WORKDIR mkdir -p $C_PLOT_WORKDIR cd $C_PLOT_WORKDIR diff --git a/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh b/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh index 80e8c43d..11cc3b33 100755 --- a/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh +++ b/src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh @@ -25,7 +25,13 @@ export t_TYPE=" t120_00 t130_00 t131_00 t132_00 t133_00 t134_00 t135_00 t180_00 t181_00 t182_00 t183_00 t187_00 " - export uv_TYPE=" uv220_00 uv221_00 uv223_00 uv224_00 uv228_00 uv229_00 uv230_00 uv231_00 uv232_00 uv233_00 uv234_00 uv235_00 uv242_00 uv243_00 uv243_55 uv243_56 uv245_257 uv245_259 uv245_270 uv246_257 uv246_257 uv246_270 uv247_257 uv247_259 uv247_270 uv248_00 uv249_00 uv250_00 uv251_00 uv252_00 uv253_00 uv253_55 uv253_56 uv254_00 uv254_55 uv254_56 uv255_00 uv256_00 uv257_00 uv258_00 uv280_00 uv281_00 uv282_00 uv284_00 uv287_00" + #----------------------------------------------------------------------------------------------------- + # This list has been modified temporarily to remove specific data types/subtypes that produce fatal + # errors when plotting. This is to be corrected in GSI-monitor issue #62. + #----------------------------------------------------------------------------------------------------- +# export uv_TYPE=" uv220_00 uv221_00 uv223_00 uv224_00 uv228_00 uv229_00 uv230_00 uv231_00 uv232_00 uv233_00 uv234_00 uv235_00 uv242_00 uv243_00 uv243_55 uv243_56 uv245_257 uv245_259 uv245_270 uv246_257 uv246_257 uv246_270 uv247_257 uv247_259 uv247_270 uv248_00 uv249_00 uv250_00 uv251_00 uv252_00 uv253_00 uv253_55 uv253_56 uv254_00 uv254_55 uv254_56 uv255_00 uv256_00 uv257_00 uv258_00 uv280_00 uv281_00 uv282_00 uv284_00 uv287_00" + export uv_TYPE=" uv220_00 uv221_00 uv223_00 uv224_00 uv228_00 uv230_00 uv231_00 uv232_00 uv233_00 uv234_00 uv235_00 uv242_00 uv243_00 uv243_55 uv243_56 uv245_257 uv245_259 uv245_270 uv246_257 uv246_257 uv246_270 uv247_257 uv247_259 uv247_270 uv248_00 uv249_00 uv250_00 uv251_00 uv252_00 uv253_00 uv253_55 uv253_56 uv254_00 uv254_55 uv254_56 uv255_00 uv256_00 uv257_00 uv258_00" + export nreal_ps=${nreal_ps:-17} @@ -56,8 +62,8 @@ -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_hist} elif [[ $MY_MACHINE == "wcoss2" ]]; then - $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \ - -l select=1:mem=500M ${plot_hist} + $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \ + -l select=1:mem=1G ${plot_hist} fi diff --git a/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh b/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh index 30aa44ce..c4a27765 100755 --- a/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh +++ b/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh @@ -68,13 +68,13 @@ echo "--> mk_time_vert.sh" elif [[ ${MY_MACHINE} == "wcoss2" ]]; then if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then - walltime="02:00:00" + walltime="02:30:00" else walltime="50:00" fi $SUB -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} -l walltime=${walltime}\ - -N ${jobname} -l select=1:mem=200M ${pltfile} + -N ${jobname} -l select=1:mem=1G ${pltfile} fi done @@ -112,7 +112,7 @@ echo "--> mk_time_vert.sh" elif [[ ${MY_MACHINE} == "wcoss2" ]]; then ${SUB} -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} -l walltime=50:00 \ - -N ${jobname} -l select=1:mem=500M ${pltfile} + -N ${jobname} -l select=1:mem=500M ${pltfile} fi done diff --git a/src/Conventional_Monitor/image_gen/ush/plot_hist.sh b/src/Conventional_Monitor/image_gen/ush/plot_hist.sh index ef5774c9..1b4666b3 100755 --- a/src/Conventional_Monitor/image_gen/ush/plot_hist.sh +++ b/src/Conventional_Monitor/image_gen/ush/plot_hist.sh @@ -68,12 +68,12 @@ mkdir -p ${workdir} cd ${workdir} - hh_tankdir=`$MON_USH/get_stats_path.sh --run $RUN --pdate ${PDATE} \ - --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` + hh_tankdir=`${MON_USH}/get_stats_path.sh --run ${RUN} --pdate ${PDATE} \ + --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` hh_tankdir=${hh_tankdir}/horz_hist - $UNCOMPRESS ${hh_tankdir}/anl/*.scater.*${Z} - $UNCOMPRESS ${hh_tankdir}/ges/*.scater.*${Z} + $UNCOMPRESS ${hh_tankdir}/anl/*.scater.*.gz + $UNCOMPRESS ${hh_tankdir}/ges/*.scater.*.gz outdir=${C_IMGNDIR}/pngs/hist/ if [[ ! -d ${outdir} ]]; then @@ -259,22 +259,23 @@ cp ${C_IG_GSCRIPTS}/setvpage.gs ./setvpage.gs fi - cat fileout.ges.${dtype}_${uvtype} > fileout - cat fileout.anl.${dtype}_${uvtype} >> fileout - cp fileout fileout_all.${dtype}_${uvtype} - - sed -e "s/XSIZE/$xsize/" \ - -e "s/YSIZE/$ysize/" \ - -e "s/PLOTFILE/${dtype}_${uvtype}/" \ - -e "s/SDATE/$PDATE/" \ - plot_hist.gs > plothist_${dtype}_${uvtype}.gs - - - #------------------------------------- - # run the GrADS plot script - # - echo 'quit' | grads -blc " run plothist_${dtype}_${uvtype}.gs" - + if [[ -e fileout.ges.${dtype} && -e fileout.anl.${dtype} ]]; then + cat fileout.ges.${dtype}_${uvtype} > fileout + cat fileout.anl.${dtype}_${uvtype} >> fileout + cp fileout fileout_all.${dtype}_${uvtype} + + sed -e "s/XSIZE/$xsize/" \ + -e "s/YSIZE/$ysize/" \ + -e "s/PLOTFILE/${dtype}_${uvtype}/" \ + -e "s/SDATE/$PDATE/" \ + plot_hist.gs > plothist_${dtype}_${uvtype}.gs + + + #------------------------------------- + # run the GrADS plot script + # + echo 'quit' | grads -blc " run plothist_${dtype}_${uvtype}.gs" + fi done ### uvtype loop fi @@ -286,13 +287,20 @@ #------------------------------------- # run the GrADS plot script # - cat fileout.ges.${dtype} > fileout - cat fileout.anl.${dtype} >> fileout - cp fileout fileout_all.${dtype} + if [[ -e fileout.ges.${dtype} && -e fileout.anl.${dtype} ]]; then + echo "Plotting ${dtype}"; echo + + cat fileout.ges.${dtype} > fileout + cat fileout.anl.${dtype} >> fileout + cp fileout fileout_all.${dtype} - echo 'quit' | grads -blc " run plothist_${dtype}.gs" - rm fileout - + echo 'quit' | grads -blc " run plothist_${dtype}.gs" + rm fileout + + else + echo "No data for ${dtype}, skipping"; echo + fi + done ### dtype loop done ### type loop diff --git a/src/Conventional_Monitor/image_gen/ush/plot_horz.sh b/src/Conventional_Monitor/image_gen/ush/plot_horz.sh index 9245dbb9..18270b61 100755 --- a/src/Conventional_Monitor/image_gen/ush/plot_horz.sh +++ b/src/Conventional_Monitor/image_gen/ush/plot_horz.sh @@ -7,7 +7,9 @@ #---------------------------------------------------------------------------------------- echo "--> plot_horz.sh" - hh_tankdir=${C_TANKDIR}/${RUN}.${PDY}/${CYC}/conmon/horz_hist + hh_tankdir=`${MON_USH}/get_stats_path.sh --run ${RUN} --pdate ${PDATE} \ + --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` + hh_tankdir=${hh_tankdir}/horz_hist export xsize=x800 export ysize=y600 @@ -23,11 +25,18 @@ #---------------------------------------------------------------------- # link in the analysis and guess data files #---------------------------------------------------------------------- - ${UNCOMPRESS} ${hh_tankdir}/anl/anal.${PDATE}.${Z} - ${UNCOMPRESS} ${hh_tankdir}/ges/guess.${PDATE}.${Z} + anl_file=${hh_tankdir}/anl/anal.${PDATE} + ges_file=${hh_tankdir}/ges/guess.${PDATE} - ln -s ${hh_tankdir}/anl/anal.${PDATE} anal.${PDATE} - ln -s ${hh_tankdir}/ges/guess.${PDATE} guess.${PDATE} + if [[ -e ${anl_file}.gz ]]; then + ${UNCOMPRESS} ${anl_file}.gz + fi + if [[ -e ${ges_file}.gz ]]; then + ${UNCOMPRESS} ${ges_file}.gz + fi + + ln -s ${anl_file} anal.${PDATE} + ln -s ${ges_file} guess.${PDATE} #---------------------------------------------------------------------- @@ -65,7 +74,8 @@ #--------------------------------------- # build the control file for the data #--------------------------------------- - if [ "$mtype" = 'ps180' -o "$mtype" = 'ps181' -o "$mtype" = 'ps183' -o "$mtype" = 'ps187' ]; then + if [ "$mtype" = 'ps180' -o "$mtype" = 'ps181' -o \ + "$mtype" = 'ps183' -o "$mtype" = 'ps187' ]; then cp ${C_IG_FIX}/pstime.ctl ./${dtype}.ctl cp ${C_IG_GSCRIPTS}/plot_ps_horz.gs ./plot_${dtype}.gs @@ -80,12 +90,14 @@ cp ${C_IG_FIX}/tmandlev.ctl ./${dtype}.ctl cp ${C_IG_GSCRIPTS}/plot_tallev_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 't180' -o "$mtype" = 't181' -o "$mtype" = 't182' -o "$mtype" = 't183' -o "$mtype" = 't187' ]; then + elif [ "$mtype" = 't180' -o "$mtype" = 't181' -o "$mtype" = 't182' -o \ + "$mtype" = 't183' -o "$mtype" = 't187' ]; then cp ${C_IG_FIX}/tsfc.ctl ./${dtype}.ctl cp ${C_IG_GSCRIPTS}/plot_tsfc_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 't130' -o "$mtype" = 't131' -o "$mtype" = 't132' -o "$mtype" = 't133' -o "$mtype" = 't134' -o "$mtype" = 't135' ]; then + elif [ "$mtype" = 't130' -o "$mtype" = 't131' -o "$mtype" = 't132' -o \ + "$mtype" = 't133' -o "$mtype" = 't134' -o "$mtype" = 't135' ]; then cp ${C_IG_FIX}/tallev.ctl ./${dtype}.ctl cp ${C_IG_GSCRIPTS}/plot_tallev_horz.gs ./plot_${dtype}.gs @@ -95,11 +107,13 @@ cp ${C_IG_FIX}/qmandlev.ctl ./${dtype}.ctl cp ${C_IG_GSCRIPTS}/plot_qallev_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 'q180' -o "$mtype" = 'q181' -o "$mtype" = 'q182' -o "$mtype" = 'q183' -o "$mtype" = 'q187' ];then + elif [ "$mtype" = 'q180' -o "$mtype" = 'q181' -o "$mtype" = 'q182' -o \ + "$mtype" = 'q183' -o "$mtype" = 'q187' ]; then cp ${C_IG_FIX}/qsfc.ctl ./${dtype}.ctl cp ${C_IG_GSCRIPTS}/plot_qsfc_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 'q130' -o "$mtype" = 'q131' -o "$mtype" = 'q132' -o "$mtype" = 'q133' -o "$mtype" = 'q134' -o "$mtype" = 'q135' ]; then + elif [ "$mtype" = 'q130' -o "$mtype" = 'q131' -o "$mtype" = 'q132' -o \ + "$mtype" = 'q133' -o "$mtype" = 'q134' -o "$mtype" = 'q135' ]; then cp ${C_IG_FIX}/qallev.ctl ./${dtype}.ctl cp ${C_IG_GSCRIPTS}/plot_qallev_horz.gs ./plot_${dtype}.gs @@ -113,7 +127,8 @@ cp $CTLDIR/uvsig.ctl ./${dtype}.ctl cp $GSCRIPTS/plot_uvallev_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 'uv221' -o "$mtype" = 'uv230' -o "$mtype" = 'uv231' -o "$mtype" = 'uv232' -o "$mtype" = 'uv233' -o "$mtype" = 'uv234' -o "$mtype" = 'uv235' ]; then + elif [ "$mtype" = 'uv221' -o "$mtype" = 'uv230' -o "$mtype" = 'uv231' -o \ + "$mtype" = 'uv232' -o "$mtype" = 'uv233' -o "$mtype" = 'uv234' -o "$mtype" = 'uv235' ]; then cp $CTLDIR/uvallev.ctl ./${dtype}.ctl cp $GSCRIPTS/plot_uvallev_horz.gs ./plot_${dtype}.gs @@ -143,7 +158,6 @@ ln -s ${grads_file} ${dtype}.grads.${cycle}.${PDATE} else - echo "WARNING: unable to locate ${grads_file}" continue fi @@ -152,29 +166,37 @@ done ## done with cycle - #--------------------------------------------- - # set plot variables in the GrADS script - #--------------------------------------------- - sed -e "s/XSIZE/$xsize/" \ - -e "s/YSIZE/$ysize/" \ - -e "s/PLOTFILE/$mtype/" \ - -e "s/PLOT2/$dtype/" \ - -e "s/RDATE/$PDATE/" \ - -e "s/HINT/${hint}/" \ - -e "s/NT/$nt/" \ - plot_${dtype}.gs >plothorz_${dtype}.gs - - $GRADS -blc "run plothorz_${dtype}.gs" - - outdir=${C_IMGNDIR}/pngs/horz - mkdir -p ${outdir} - - img_files=`ls *.png` - for imgf in ${img_files}; do - newf=`echo $imgf | sed -e "s/\./.${PDATE}./g"` - cp ${imgf} ${newf} - mv ${newf} ${outdir}/. - done + # add check for grads_files here, continue if not found + + if [[ -e ${dtype}.grads.ges.${PDATE} && -e ${dtype}.grads.anl.${PDATE} ]]; then + echo "OK to plot ${dtype}" + + #--------------------------------------------- + # set plot variables in the GrADS script + #--------------------------------------------- + sed -e "s/XSIZE/$xsize/" \ + -e "s/YSIZE/$ysize/" \ + -e "s/PLOTFILE/$mtype/" \ + -e "s/PLOT2/$dtype/" \ + -e "s/RDATE/$PDATE/" \ + -e "s/HINT/${hint}/" \ + -e "s/NT/$nt/" \ + plot_${dtype}.gs >plothorz_${dtype}.gs + + $GRADS -blc "run plothorz_${dtype}.gs" + + outdir=${C_IMGNDIR}/pngs/horz + mkdir -p ${outdir} + + img_files=`ls *.png` + for imgf in ${img_files}; do + newf=`echo $imgf | sed -e "s/\./.${PDATE}./g"` + mv ${imgf} ${outdir}/${newf} + done + + else + echo "No data for ${dtype}, skipping plot"; echo + fi done ### dtype loop diff --git a/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh b/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh index ad5686e5..a6e86d3a 100755 --- a/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh +++ b/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh @@ -7,7 +7,9 @@ #--------------------------------------------------------------------- echo "--> plot_horz_uv.sh" - hh_tankdir=${C_TANKDIR}/${RUN}.${PDY}/${CYC}/conmon/horz_hist + hh_tankdir=`${MON_USH}/get_stats_path.sh --run ${RUN} --pdate ${PDATE} \ + --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` + hh_tankdir=${hh_tankdir}/horz_hist workdir=${C_PLOT_WORKDIR}/plothorz_uv if [[ -d ${workdir} ]]; then @@ -22,11 +24,18 @@ #---------------------------------------------------------------------- # Link in the analysis and guess data files #---------------------------------------------------------------------- - ${UNCOMPRESS} ${hh_tankdir}/anl/anal.${PDATE}.gz - ${UNCOMPRESS} ${hh_tankdir}/ges/guess.${PDATE}.gz + anl_file=${hh_tankdir}/anl/anal.${PDATE} + ges_file=${hh_tankdir}/ges/guess.${PDATE} - ln -s ${hh_tankdir}/anl/anal.${PDATE} anal.${PDATE} - ln -s ${hh_tankdir}/ges/guess.${PDATE} guess.${PDATE} + if [[ -e ${anl_file}.gz ]]; then + ${UNCOMPRESS} ${anl_file}.gz + fi + if [[ -e ${ges_file}.gz ]]; then + ${UNCOMPRESS} ${ges_file}.gz + fi + + ln -s ${anl_file} anal.${PDATE} + ln -s ${ges_file} guess.${PDATE} #---------------------------------------------------------------------- @@ -77,35 +86,31 @@ ${NCP} ${C_IG_FIX}/uvsig.ctl ./${dtype}.ctl ${NCP} ${C_IG_GSCRIPTS}/plot_uvallev_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 'uv221' -o "$mtype" = 'uv230' -o "$mtype" = 'uv231' -o "$mtype" = 'uv232' -o "$mtype" = 'uv233' -o "$mtype" = 'uv234' -o "$mtype" = 'uv235' ]; then + elif [ "$mtype" = 'uv221' -o "$mtype" = 'uv230' -o "$mtype" = 'uv231' -o\ + "$mtype" = 'uv232' -o "$mtype" = 'uv233' -o "$mtype" = 'uv234' -o "$mtype" = 'uv235' ]; then ${NCP} ${C_IG_FIX}/uvallev.ctl ./${dtype}.ctl ${NCP} ${C_IG_GSCRIPTS}/plot_uvallev_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 'uv242' -o "$mtype" = 'uv243' -o "$mtype" = 'uv245' -o "$mtype" = 'uv246' -o "$mtype" = 'uv247' -o "$mtype" = 'uv248' -o "$mtype" = 'uv249' -o "$mtype" = 'uv250' -o "$mtype" = 'uv251' -o "$mtype" = 'uv252' -o "$mtype" = 'uv253' -o "$mtype" = 'uv254' -o "$mtype" = 'uv255' -o "$mtype" = 'uv256' -o "$mtype" = 'uv257' -o "$mtype" = 'uv258' ]; then + elif [ "$mtype" = 'uv242' -o "$mtype" = 'uv243' -o "$mtype" = 'uv245' -o \ + "$mtype" = 'uv246' -o "$mtype" = 'uv247' -o "$mtype" = 'uv248' -o \ + "$mtype" = 'uv249' -o "$mtype" = 'uv250' -o "$mtype" = 'uv251' -o \ + "$mtype" = 'uv252' -o "$mtype" = 'uv253' -o "$mtype" = 'uv254' -o \ + "$mtype" = 'uv255' -o "$mtype" = 'uv256' -o "$mtype" = 'uv257' -o "$mtype" = 'uv258' ]; then ${NCP} ${C_IG_FIX}/uvallev.ctl ./${dtype}.ctl ${NCP} ${C_IG_GSCRIPTS}/plot_uvsatwind_horz.gs ./plot_${dtype}.gs - elif [ "$mtype" = 'uv280' -o "$mtype" = 'uv281' -o "$mtype" = 'uv282' -o "$mtype" = 'uv284' -o "$mtype" = 'uv287' ]; then + elif [ "$mtype" = 'uv280' -o "$mtype" = 'uv281' -o "$mtype" = 'uv282' -o \ + "$mtype" = 'uv284' -o "$mtype" = 'uv287' ]; then ${NCP} ${C_IG_FIX}/uvsfc11.ctl ./${dtype}.ctl ${NCP} ${C_IG_GSCRIPTS}/plot_uvsfc_horz.gs ./plot_${dtype}.gs - if [ -s ${hh_tankdir}/${cycle}/nt_${dtype}.${PDATE} ]; then - echo "LOCATED nt file" - nt=`cat ${hh_tankdir}/${cycle}/nt_${dtype}.${PDATE}` - echo "nt set to $nt" - fi elif [ "$mtype" = 'uv229' ]; then ${NCP} ${C_IG_FIX}/uvsfc7.ctl ./${dtype}.ctl ${NCP} ${C_IG_GSCRIPTS}/plot_uvsfc_horz.gs ./plot_${dtype}.gs - if [ -s ${hh_tankdir}/${cycle}/nt_${dtype}.${PDATE} ]; then - echo "LOCATED nt file" - nt=`cat ${hh_tankdir}/${cycle}/nt_${dtype}.${PDATE}` - echo "nt set to $nt" - fi fi @@ -131,44 +136,46 @@ ln -s ${grads_file} ${dtype}.grads.${cycle}.${PDATE} else - echo "WARNING: unable to locate ${grads_file}" continue fi stnmap -1 -i ${dtype}.grads.${cycle}.ctl done ## done with cycle - - if [ ! -s ${hh_tankdir}/$cycle/${dtype}.grads.${cycle}.${PDATE} ]; then - continue - fi - - #---------------------------------------- - # set plot variables in GrADS script - #---------------------------------------- - sed -e "s/XSIZE/$xsize/" \ - -e "s/YSIZE/$ysize/" \ - -e "s/PLOTFILE/$mtype/" \ - -e "s/PLOT2/$dtype/" \ - -e "s/RDATE/$PDATE/" \ - -e "s/HINT/${hint}/" \ - -e "s/NT/$nt/" \ - -e "s/DINDEX/$dindex/" \ - plot_${dtype}.gs >plothorz_${dtype}.gs - - ${GRADS} -blc "run plothorz_${dtype}.gs" - - - outdir=${C_IMGNDIR}/pngs/horz - if [[ ! -d ${outdir} ]]; then - mkdir -p ${outdir} - fi - - img_files=`ls *.png` - for imgf in $img_files; do - newf=`echo ${imgf} | sed -e "s/\./.${PDATE}./g"` - cp ${imgf} ${C_IMGNDIR}/pngs/horz/${newf} - done + + if [[ -e ${dtype}.grads.ges.${PDATE} && -e ${dtype}.grads.anl.${PDATE} ]]; then + echo "OK to plot ${dtype}" + + #---------------------------------------- + # set plot variables in GrADS script + #---------------------------------------- + sed -e "s/XSIZE/$xsize/" \ + -e "s/YSIZE/$ysize/" \ + -e "s/PLOTFILE/$mtype/" \ + -e "s/PLOT2/$dtype/" \ + -e "s/RDATE/$PDATE/" \ + -e "s/HINT/${hint}/" \ + -e "s/NT/$nt/" \ + -e "s/DINDEX/$dindex/" \ + plot_${dtype}.gs >plothorz_${dtype}.gs + + ${GRADS} -blc "run plothorz_${dtype}.gs" + + + outdir=${C_IMGNDIR}/pngs/horz + if [[ ! -d ${outdir} ]]; then + mkdir -p ${outdir} + fi + + img_files=`ls *.png` + for imgf in $img_files; do + newf=`echo ${imgf} | sed -e "s/\./.${PDATE}./g"` + mv ${imgf} ${C_IMGNDIR}/pngs/horz/${newf} + done + + else + echo "No data for ${dtype}, skipping plot"; echo + fi done ### dtype loop done ### type loop @@ -182,6 +189,7 @@ rm -rf ${workdir} fi + echo "<-- plot_horz_uv.sh" exit diff --git a/src/Conventional_Monitor/image_gen/ush/plot_time.sh b/src/Conventional_Monitor/image_gen/ush/plot_time.sh index fec54171..225d18fc 100755 --- a/src/Conventional_Monitor/image_gen/ush/plot_time.sh +++ b/src/Conventional_Monitor/image_gen/ush/plot_time.sh @@ -32,10 +32,6 @@ function large_mv () { mkdir -p ${workdir} cd ${workdir} - pdy=`echo $PDATE|cut -c1-8` - cyc=`echo $PDATE|cut -c9-10` - tv_tankdir=${C_TANKDIR}/${RUN}.${pdy}/${cyc}/conmon/time_vert - export xsize=x800 export ysize=y600 @@ -51,12 +47,15 @@ function large_mv () { while [[ $cdate -le $edate ]] ; do day=`echo $cdate | cut -c1-8 ` dcyc=`echo $cdate |cut -c9-10` + test_dir=`${MON_USH}/get_stats_path.sh --run ${RUN} --pdate ${cdate} \ + --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` - if [[ -d ${C_TANKDIR}/${RUN}.${day}/${dcyc}/conmon ]]; then + if [[ -d ${test_dir} ]]; then for cycle in ges anl; do data_file=${cycle}_${TYPE}_stas.${cdate} - data_fp=${C_TANKDIR}/${RUN}.${day}/${dcyc}/conmon/time_vert/${data_file} + data_fp=${test_dir}/time_vert/${data_file} + if [[ -e ${data_fp}.${Z} ]]; then cp -f ${data_fp}.${Z} ./${data_file}.${Z} $UNCOMPRESS ${data_file}.${Z} @@ -77,7 +76,11 @@ function large_mv () { #--------------------------------------------------- for cycle in ges anl; do - ctl_file=${tv_tankdir}/${cycle}_${TYPE}_stas.ctl + test_dir=`$MON_USH/get_stats_path.sh --run $RUN --pdate ${PDATE} \ + --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` + + ctl_file=${test_dir}/time_vert/${cycle}_${TYPE}_stas.ctl + if [[ -e ${ctl_file}.${Z} ]]; then cp -f ${ctl_file}.${Z} tmp.ctl.${Z} ${UNCOMPRESS} tmp.ctl.${Z} @@ -109,8 +112,8 @@ function large_mv () { # copy plots scripts locally, modify, and run #--------------------------------------------------- - for script in plotstas_time_count.gs plotstas_time_bias.gs ;do - if [[ ${TYPE} = 'gps' && ${script} = 'plotstas_time_bias.gs' ]]; then + for script in plotstas_time_count.gs plotstas_time_bias.gs plotstas_time_bias2.gs ;do + if [[ ${TYPE} = 'gps' && ${script} != 'plotstas_time_count.gs' ]]; then continue fi @@ -147,6 +150,7 @@ function large_mv () { done + C_IG_SAVE_WORK=1 if [[ ${C_IG_SAVE_WORK} -eq 0 ]]; then cd ${workdir} cd .. diff --git a/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh b/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh index beb6e543..1b825c21 100755 --- a/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh +++ b/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh @@ -13,19 +13,16 @@ mkdir -p ${workdir} cd ${workdir} - pdy=`echo $PDATE|cut -c1-8` - cyc=`echo $PDATE|cut -c9-10` - tv_tankdir=${C_TANKDIR}/${RUN}.${pdy}/${cyc}/conmon/time_vert - export xsize=x800 export ysize=y600 - #--------------------------------------------------- - # plot surface pressure time series counts - #--------------------------------------------------- + #------------------------------------------------------- + # copy over surface pressure time-series GrADS scripts + #------------------------------------------------------- ${NCP} ${C_IG_GSCRIPTS}/plotstas_time_count_ps.gs . ${NCP} ${C_IG_GSCRIPTS}/plotstas_time_bias_ps.gs . + ${NCP} ${C_IG_GSCRIPTS}/plotstas_time_bias2_ps.gs . #--------------------------------------------------- # Link in the data files. @@ -37,11 +34,13 @@ while [[ $cdate -le $edate ]] ; do day=`echo $cdate | cut -c1-8 ` dcyc=`echo $cdate | cut -c9-10 ` + test_dir=`${MON_USH}/get_stats_path.sh --run ${RUN} --pdate ${cdate} \ + --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` - if [[ -d ${C_TANKDIR}/${RUN}.${day}/${dcyc}/conmon ]]; then + if [[ -d ${test_dir} ]]; then for cycle in ges anl; do - stas_file=${C_TANKDIR}/${RUN}.${day}/${dcyc}/conmon/time_vert/${cycle}_ps_stas.${cdate} + stas_file=${test_dir}/time_vert/${cycle}_ps_stas.${cdate} if [[ -e ${stas_file}.${Z} ]]; then ${UNCOMPRESS} ${stas_file}.${Z} fi @@ -59,9 +58,13 @@ #--------------------------------------------------- # Copy over the ctl files, modify dset and tset #--------------------------------------------------- + test_dir=`$MON_USH/get_stats_path.sh --run $RUN --pdate ${PDATE} \ + --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon` + for cycle in ges anl; do - ctl_file=${tv_tankdir}/${cycle}_ps_stas.ctl + ctl_file=${test_dir}/time_vert/${cycle}_ps_stas.ctl + if [[ -e ${ctl_file}.${Z} ]]; then cp -f ${ctl_file}.${Z} tmp.ctl.${Z} ${UNCOMPRESS} tmp.ctl.${Z} @@ -71,7 +74,6 @@ new_dset=" dset ${cycle}_ps_stas.%y4%m2%d2%h2" tdef=`${C_IG_SCRIPTS}/make_tdef.sh ${START_DATE} ${NUM_CYCLES} 06` - echo "tdef = $tdef" sed -e "s/^dset*/${new_dset}/" tmp.ctl >tmp2.ctl sed -e "s/^tdef.*/${tdef}/" tmp2.ctl >${cycle}_ps_stas.ctl @@ -82,7 +84,7 @@ #------------------------------------------ # ensure the imgn destination dir exists #------------------------------------------ - outdir=${C_IMGNDIR}/pngs/time/${cyc} + outdir=${C_IMGNDIR}/pngs/time if [[ ! -d ${outdir} ]]; then mkdir -p ${outdir} fi @@ -92,23 +94,15 @@ #------------------------- grads -bpc "run ./plotstas_time_count_ps.gs" - grads -bpc "run ./plotstas_time_bias_ps.gs" - -# grads -bpc "run ./plotstas_time_bias2_ps.gs" + grads -bpc "run ./plotstas_time_bias2_ps.gs" img_files=`ls *.png` for imgf in ${img_files}; do newf=`echo ${imgf} | sed -e "s/\./.${PDATE}./g"` - cp ${imgf} ${newf} - mv ${newf} ${C_IMGNDIR}/pngs/time/. + mv ${imgf} ${outdir}/${newf} done - mv -f *.png ${outdir}/. - - - - if [[ ${C_IG_SAVE_WORK} -eq 0 ]]; then cd ${workdir} cd .. diff --git a/src/Conventional_Monitor/image_gen/ush/plot_vert.sh b/src/Conventional_Monitor/image_gen/ush/plot_vert.sh index fb942bb8..becf915b 100755 --- a/src/Conventional_Monitor/image_gen/ush/plot_vert.sh +++ b/src/Conventional_Monitor/image_gen/ush/plot_vert.sh @@ -70,7 +70,6 @@ num_cycles=${NUM_CYCLES} tdef=`${C_IG_SCRIPTS}/make_tdef.sh ${START_DATE} ${num_cycles} 06` - echo "tdef = $tdef" sed -e "s/^dset*/${new_dset}/" tmp.ctl >tmp2.ctl sed -e "s/^tdef.*/${tdef}/" tmp2.ctl >${cycle}_${TYPE}_stas.ctl @@ -81,7 +80,7 @@ #------------------------------------------ # ensure the imgn destination dir exists #------------------------------------------ - outdir=${C_IMGNDIR}/pngs/vert/${cyc} + outdir=${C_IMGNDIR}/pngs/vert if [[ ! -d ${outdir} ]]; then mkdir -p ${outdir} fi @@ -125,14 +124,12 @@ done img_files=`ls *vert*.png` - for imgf in $img_files; do + for imgf in ${img_files}; do newf=`echo $imgf | sed -e "s/\./.${PDATE}./g"` - cp $imgf $newf - mv $newf ${C_IMGNDIR}/pngs/vert/. + mv ${imgf} ${outdir}/${newf} + done - mv -f *.png ${outdir}/. - if [[ ${C_IG_SAVE_WORK} -eq 0 ]]; then cd ${workdir} cd .. diff --git a/src/Conventional_Monitor/image_gen/ush/rm_img_files.pl b/src/Conventional_Monitor/image_gen/ush/rm_img_files.pl index e7973655..58cb18ae 100755 --- a/src/Conventional_Monitor/image_gen/ush/rm_img_files.pl +++ b/src/Conventional_Monitor/image_gen/ush/rm_img_files.pl @@ -22,7 +22,7 @@ # Main begins here #-------------------- -print "--> rm_img_files.pl"; +print "--> rm_img_files.pl\n"; #-------------------------------- # load command line argument(s) @@ -70,13 +70,7 @@ my $ii = $nfl; my $end = $#unique; - foreach my $time ( @unique ) { -# print "$time\n"; - } - - print " ii, end = $ii, $end\n"; do { -# print "RM $ii, $unique[$ii]\n"; push( @del_list, $unique[$ii] ); $ii++; } while $ii <= $end; @@ -99,4 +93,4 @@ } } -print "<-- rm_img_files.pl"; +print "<-- rm_img_files.pl\n"; diff --git a/src/Conventional_Monitor/parm/ConMon_config b/src/Conventional_Monitor/parm/ConMon_config index 2ff67829..25954a25 100644 --- a/src/Conventional_Monitor/parm/ConMon_config +++ b/src/Conventional_Monitor/parm/ConMon_config @@ -81,8 +81,8 @@ export STNMAP=`which stnmap` # export MY_CONMON=${MY_GSI_MONITOR}/src/Conventional_Monitor -export C_STMP_USER=${C_STMP_USER:-${MON_STMP}/${LOGNAME}} -export C_PTMP_USER=${C_PTMP_USER:-${MON_PTMP}/${LOGNAME}} +export C_STMP_USER=${C_STMP_USER:-${MON_STMP}} +export C_PTMP_USER=${C_PTMP_USER:-${MON_PTMP}} export C_LOGDIR=${MON_LOGDIR}/${CONMON_SUFFIX}/${RUN}/conmon export CONMON_IMAGE_GEN=${CONMON_IMAGE_GEN:-${MY_CONMON}/image_gen}