Ref NOAA-EMC#310

More cleanup
EdwardSafford-NOAA · Apr 25, 2022 · f6a7705 · f6a7705
1 parent 1f631ca
commit f6a7705
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 34 deletions.
diff --git a/util/Ozone_Monitor/parm/OznMon_config b/util/Ozone_Monitor/parm/OznMon_config
@@ -18,7 +18,7 @@ if [[ $OZNMON_CONFIG -ne 1 ]]; then
 
    export OZNMON_CONFIG=1   
 
-   export MY_MACHINE=wcoss2
+   export MY_MACHINE=wcoss_d
 
    #-------------------------------------------------------------------
    #  Note:  The file header in the oznstat file has slightly changed.
@@ -38,7 +38,7 @@ if [[ $OZNMON_CONFIG -ne 1 ]]; then
    # you checked out only the Ozone_Monitor portion of the branch then
    # MY_RADMON should point to that.
    #
-   export MY_OZNMON=${MY_OZNMON:-/lfs/h2/emc/da/noscrub/Edward.Safford/git/gsi/GSI/util/Ozone_Monitor}
+   export MY_OZNMON=${MY_OZNMON:-/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/GSI/util/Ozone_Monitor}
 
    export OZN_SCRIPTS=${OZN_SCRIPTS:-${MY_OZNMON}/scripts}
    export OZN_DE_SCRIPTS=${OZN_DE_SCRIPTS:-${MY_OZNMON}/data_xtrct/ush}
@@ -66,7 +66,7 @@ if [[ $OZNMON_CONFIG -ne 1 ]]; then
    #  and the succedding scripts will construct and use subdirectories under
    #  this location.
    #
-   export OZN_TANKDIR=${OZN_TANKDIR:-/lfs/h2/emc/da/noscrub/Edward.Safford/nbns}
+   export OZN_TANKDIR=${OZN_TANKDIR:-/u/Edward.Safford/nbns}
 
    if [[ $GLB_AREA -eq 1 ]]; then
       OZN_IMGN_TANKDIR=${OZN_TANKDIR}/imgn/${OZNMON_SUFFIX}
@@ -93,9 +93,9 @@ if [[ $OZNMON_CONFIG -ne 1 ]]; then
    #
    #  Log and work space definitions
    #
-   export OZN_PTMP=${OZN_PTMP:-/lfs/h2/emc/ptmp}
+   export OZN_PTMP=${OZN_PTMP:-/gpfs/dell2/ptmp}
    export PTMP_USER=${PTMP_USER:-${OZN_PTMP}/${LOGNAME}}
-   export OZN_STMP=${OZN_STMP:-/lfs/h2/emc/stmp}
+   export OZN_STMP=${OZN_STMP:-/gpfs/dell2/stmp}
    export STMP_USER=${STMP_USER:-${OZN_STMP}/${LOGNAME}}
 
 
@@ -213,24 +213,6 @@ if [[ $OZNMON_CONFIG -ne 1 ]]; then
 
       export PARTITION_OZNMON=${PARTITION_OZNMON:-vjet}
 
-   elif [[ $MY_MACHINE = "wcoss2" ]]; then
-      module load prod_util/2.0.13
-      module load util_shared/1.4.0
-
-      #------------------------
-      # temporary workaround
-      #
-      module use /apps/test/modules
-      module load GrADS/2.2.1-cce-11.0.4
-      export GRADS=`which grads`
-      export STNMAP=`which stnmap`
-      #------------------------
-
-      export SUB="qsub"
-      export COMPRESS=/usr/bin/gzip
-      export UNCOMPRESS="/usr/bin/gunzip -f"
-      export RSYNC=`which rsync`
-
    fi
 
 else

diff --git a/util/Radiance_Monitor/image_gen/src/radmon_ig_angle.fd/angle.f90 b/util/Radiance_Monitor/image_gen/src/radmon_ig_angle.fd/angle.f90
@@ -1416,12 +1416,6 @@ 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 )
@@ -1600,11 +1594,6 @@ 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), &