From 3f968489c5e5132be663f07a1c023b22088bd2cc Mon Sep 17 00:00:00 2001 From: "Judy.K.Henderson" Date: Wed, 1 Jul 2020 21:03:09 +0000 Subject: [PATCH] - updated versions in Externals.cfg to match sorc/checkout.sh - no longer check out or compile fv3gfs_emc.fd - added jet partitions to env/Jet.env to determine npe_node_max - corrected setting of nwat for GSD suites in config.fcst - create aero_done file after aeroic task completes - set COMINsyn path to /lfs4/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat - set HOMEens_tracker to $HOMEgfs/sorc/ens_tracker.v1.1.15.2/ - change build_fv3.sh to compile fv3gfs_ccpp.fd - updated GSD forecastonly python script - updated modules in tracker to match workflow - added netcdf and tracker files to GSD archive script --- Externals.cfg | 35 ++-- INFO | 2 + env/JET.env | 9 +- jobs/rocoto/aeroic.sh | 3 + jobs/rocoto/arch_gsd.sh | 33 +++- parm/config/config.fcst | 2 +- parm/config/config.vrfy | 8 + sorc/build_fv3.sh | 2 +- sorc/checkout.sh | 24 +-- .../jobs/JFV3_CYCLONE_TRACK_JP | 12 +- .../sorc/Module_ens_tracker.v1.1.15_for_Jet | 5 + .../sorc/wsr_ecmwfens.fd/ecmwfensh.lst | 156 +++++++++--------- ush/rocoto/ffexp.sh | 32 ---- ush/rocoto/setup_expt_fcstonly_gsd.py | 20 ++- 14 files changed, 182 insertions(+), 161 deletions(-) create mode 100644 INFO delete mode 100755 ush/rocoto/ffexp.sh diff --git a/Externals.cfg b/Externals.cfg index 4f88947d67..abfb59ca55 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,42 +1,50 @@ # External sub-modules of global-workflow -[FV3GFS] -tag = GFS.v16.0.1 -local_path = sorc/fv3gfs.fd -repo_url = https://github.com/ufs-community/ufs-weather-model.git +#JKH[FV3GFS] +#JKHtag = orion_gfs.v16 +#JKHlocal_path = sorc/fv3gfs_emc.fd +#JKHrepo_url = https://github.com/ufs-community/ufs-weather-model.git +#JKHprotocol = git +#JKHrequired = True + +[CCPPFV3GFS] +hash = 27a8a07 +local_path = sorc/fv3gfs_ccpp.fd +repo_url = https://github.com/NOAA-GSD/ufs-weather-model.git protocol = git required = True [GSI] -tag = gfsda.v16.0.0 +tag = release/gfsda.v16.0.0 local_path = sorc/gsi.fd -repo_url = ssh://vlab.ncep.noaa.gov:29418/ProdGSI +repo_url = https://github.com/NOAA-EMC/GSI.git protocol = git required = True [GLDAS] -tag = gldas_gfsv16_release.v1.0.0 +tag = gldas_gfsv16_release.v1.2.0 local_path = sorc/gldas.fd repo_url = https://github.com/NOAA-EMC/GLDAS.git protocol = git required = True [EMC_post] -tag = upp_gfsv16_release.v1.0.5 +tag = upp_gfsv16_release.v1.0.9 local_path = sorc/gfs_post.fd repo_url = https://github.com/NOAA-EMC/EMC_post.git protocol = git required = True [UFS_UTILS] -branch = release/ops-gfsv16 +#branch = release/ops-gfsv16 +branch = feature/orion local_path = sorc/ufs_utils.fd repo_url = https://github.com/NOAA-EMC/UFS_UTILS.git protocol = git required = True [EMC_verif-global] -tag = verif_global_v1.6.0 +tag = verif_global_v1.8.1 local_path = sorc/verif-global.fd repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git protocol = git @@ -49,5 +57,12 @@ repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git protocol = git required = False +[aeroconv] +hash = b830a6c +local_path = sorc/aeroconv.fd +repo_url = https://github.com/NCAR/aeroconv.git +protocol = git +required = True + [externals_description] schema_version = 1.0.0 diff --git a/INFO b/INFO new file mode 100644 index 0000000000..e4cc622ab2 --- /dev/null +++ b/INFO @@ -0,0 +1,2 @@ +17 June 2020 + - created new branch, gsd-ccpp-jet, from 15Jun20 port2orion branch, ed6b279 diff --git a/env/JET.env b/env/JET.env index dad3ed8dc6..96a3122712 100755 --- a/env/JET.env +++ b/env/JET.env @@ -13,8 +13,11 @@ fi step=$1 -# Theia information -export npe_node_max=24 +if [[ "$PARTITION_BATCH" = "xjet" ]]; then + export npe_node_max=24 +elif [[ "$PARTITION_BATCH" = "vjet" ]]; then + export npe_node_max=16 +fi export launcher="srun --export=ALL" # Configure MPI environment @@ -194,7 +197,7 @@ elif [ $step = "epos" ]; then elif [ $step = "fv3ic" ]; then - export NTHREADS_CHGRES=${nth_chgres:-$npe_node_max} + export NTHREADS_CHGRES=${nth_fv3ic:-$npe_node_max} [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max export APRUN_CHGRES="time" diff --git a/jobs/rocoto/aeroic.sh b/jobs/rocoto/aeroic.sh index a1a347dfa5..29c369cbed 100755 --- a/jobs/rocoto/aeroic.sh +++ b/jobs/rocoto/aeroic.sh @@ -70,6 +70,9 @@ yyyymmdd=`echo $CDATE | cut -c1-8` # Move output data echo "copying updated files to $FV3ICS_DIR...." cp -p $DATA/OUTPUT/gfs*nc $FV3ICS_DIR +status=$? +[[ $status -ne 0 ]] && exit $status +touch ${FV3ICS_DIR}/aero_done ############################################################### # Force Exit out cleanly diff --git a/jobs/rocoto/arch_gsd.sh b/jobs/rocoto/arch_gsd.sh index 665df76a61..7ad95e7564 100755 --- a/jobs/rocoto/arch_gsd.sh +++ b/jobs/rocoto/arch_gsd.sh @@ -37,16 +37,31 @@ if [ $HPSSARCH = "YES" ]; then if [ $CDUMP = "gfs" ]; then - # archive nemsio files (gfs.t00z.atmfHHH.nemsio, gfs.t00z.sfcfHHH.nemsio, gfs.t00z.logfHHH.nemsio ) - htar -P -cvf $ATARDIR/$CDATE/gfs_nemsio.tar gfs.*nemsio - status=$? - if [ $status -ne 0 ]; then - echo "HTAR $CDATE gfs_nemsio.tar failed" - exit $status + ## nemsio files ## + if [ -f *nemsio ]; then + # archive nemsio files (gfs.t00z.atmfHHH.nemsio, gfs.t00z.sfcfHHH.nemsio, gfs.t00z.logfHHH.nemsio ) + htar -P -cvf $ATARDIR/$CDATE/gfs_nemsio.tar gfs.*nemsio + status=$? + if [ $status -ne 0 ]; then + echo "HTAR $CDATE gfs_nemsio.tar failed" + exit $status + fi fi - - # archive GRIB2 files (gfs.t00z.pgrb2.0p25.fHHH, gfs.t00z.pgrb2.0p50.fHHH) - htar -P -cvf $ATARDIR/$CDATE/gfs_pgrb2.tar gfs.*pgrb2.0p25* gfs.*pgrb2.0p5* + + ## netcdf files ## + if [ -f *nc ]; then + # archive netcdf files (gfs.t00z.atmfHHH.nc, gfs.t00z.sfcfHHH.nc, gfs.t00z.logfHHH.txt ) + htar -P -cvf $ATARDIR/$CDATE/gfs_nc.tar gfs*.nc gfs.*log*.txt + status=$? + if [ $status -ne 0 ]; then + echo "HTAR $CDATE gfs_nc.tar failed" + exit $status + fi + fi + + # archive GRIB2 files (gfs.t00z.pgrb2.0p25.fHHH, gfs.t00z.pgrb2.0p50.fHHH) + # and tracker files (avno.t00z.cyclone.trackatcfunix, avnop.t00z.cyclone.trackatcfunix) + htar -P -cvf $ATARDIR/$CDATE/gfs_pgrb2.tar gfs.*pgrb2.0p25* gfs.*pgrb2.0p5* avno* status=$? if [ $status -ne 0 ]; then echo "HTAR $CDATE gfs_pgrb2.tar failed" diff --git a/parm/config/config.fcst b/parm/config/config.fcst index 9adc0965df..47e7efcb92 100755 --- a/parm/config/config.fcst +++ b/parm/config/config.fcst @@ -149,6 +149,7 @@ elif [ $imp_physics -eq 6 ]; then # WSM6 export nwat=6 elif [ $imp_physics -eq 8 ]; then # Thompson + export nwat=6 if [[ "$CCPP_SUITE" == "FV3_GSD_v0" || "$CCPP_SUITE" == "FV3_GSD_noah" ]] ; then export ncld=5 export FIELD_TABLE="$HOMEgfs/parm/parm_fv3diag/field_table_gsd" @@ -167,7 +168,6 @@ elif [ $imp_physics -eq 8 ]; then # Thompson else export ncld=2 export FIELD_TABLE="$HOMEgfs/parm/parm_fv3diag/field_table_thompson${tbf}" - export nwat=6 fi elif [ $imp_physics -eq 11 ]; then # GFDL diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy index 729c6e3e26..d137bc4ba5 100755 --- a/parm/config/config.vrfy +++ b/parm/config/config.vrfy @@ -145,6 +145,11 @@ export HOMEens_tracker=$BASE_GIT/tracker/ens_tracker.${ens_tracker_ver} if [ $machine = "ORION" ] ; then export HOMEens_tracker=$BASE_GIT/tracker/TC_tracker.v1.1.15.2 fi +## JKH +if [ $machine = "JET" ] ; then + export ens_tracker_ver=v1.1.15.2 + export HOMEens_tracker=$HOMEgfs/sorc/ens_tracker.${ens_tracker_ver} +fi if [ "$VRFYTRAK" = "YES" ]; then @@ -159,6 +164,9 @@ if [ "$VRFYTRAK" = "YES" ]; then if [ $machine = "HERA" ]; then export COMROOTp1="/scratch1/NCEPDEV/rstprod/com" export COMINsyn=${COMINsyn:-${COMROOTp1}/arch/prod/syndat} + elif [ $machine = "JET" ]; then + export COMINsyn=${COMINsyn:-/mnt/lfs4/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat} +#JKH export COMINsyn=${COMINsyn:-/mnt/lfs4/HFIP/hwrf-data/hwrf-input/SYNDAT} else export COMINsyn=${COMINsyn:-${COMROOT}/gfs/prod/syndat} fi diff --git a/sorc/build_fv3.sh b/sorc/build_fv3.sh index 3a4e605c90..d46d5f8f60 100755 --- a/sorc/build_fv3.sh +++ b/sorc/build_fv3.sh @@ -20,7 +20,7 @@ if [ $target = hera ]; then target=hera.intel ; fi if [ $target = jet ]; then target=jet.intel ; fi if [ $target = orion ]; then target=orion.intel ; fi -cd fv3gfs.fd/ +cd fv3gfs_ccpp.fd/ FV3=$( pwd -P )/FV3 cd tests/ #JKH./compile.sh "$FV3" "$target" "WW3=Y 32BIT=Y" 1 diff --git a/sorc/checkout.sh b/sorc/checkout.sh index c39fde2f93..4c23e35787 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -4,17 +4,17 @@ set -xue topdir=$(pwd) echo $topdir -echo fv3gfs checkout ... -if [[ ! -d fv3gfs.fd ]] ; then - rm -f ${topdir}/checkout-fv3gfs.log - #git clone https://github.com/ufs-community/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1 - git clone https://github.com/DusanJovic-NOAA/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1 - cd fv3gfs.fd +echo fv3gfs_emc checkout ... +if [[ ! -d fv3gfs_emc.fd ]] ; then + rm -f ${topdir}/checkout-fv3gfs_emc.log + #git clone https://github.com/ufs-community/ufs-weather-model fv3gfs_emc.fd >> ${topdir}/checkout-fv3gfs_emc.log 2>&1 + git clone https://github.com/DusanJovic-NOAA/ufs-weather-model fv3gfs_emc.fd >> ${topdir}/checkout-fv3gfs_emc.log 2>&1 + cd fv3gfs_emc.fd git checkout orion_gfs.v16 git submodule update --init --recursive cd ${topdir} else - echo 'Skip. Directory fv3gfs.fd already exists.' + echo 'Skip. Directory fv3gfs_emc.fd already exists.' fi echo fv3gfs_ccpp checkout ... @@ -22,7 +22,7 @@ if [[ ! -d fv3gfs_ccpp.fd ]] ; then rm -f ${topdir}/checkout-fv3gfs_ccpp.log git clone --recursive -b gsd/develop https://github.com/NOAA-GSD/ufs-weather-model fv3gfs_ccpp.fd >> ${topdir}/checkout-fv3gfs_ccpp.log 2>&1 cd fv3gfs_ccpp.fd -# git checkout 6671b15df63eb1c728670139b53d59d63cbbf946 + git checkout 27a8a079baeb436873fc102128feef4ee6625d46 git submodule sync git submodule update --init --recursive cd ${topdir} @@ -102,11 +102,13 @@ else fi echo aeroconv checkout ... -if [[ ! -d aeroconv ]] ; then +if [[ ! -d aeroconv.fd ]] ; then rm -f ${topdir}/checkout-aero.log - git clone https://github.com/NCAR/aeroconv aeroconv >> ${topdir}/checkout-aero.log 2>&1 + git clone https://github.com/NCAR/aeroconv aeroconv.fd >> ${topdir}/checkout-aero.log 2>&1 + cd aeroconv.fd + git checkout b830a6c else - echo 'Skip. Directory aeroconv already exists.' + echo 'Skip. Directory aeroconv.fd already exists.' fi exit 0 diff --git a/sorc/ens_tracker.v1.1.15.2/jobs/JFV3_CYCLONE_TRACK_JP b/sorc/ens_tracker.v1.1.15.2/jobs/JFV3_CYCLONE_TRACK_JP index 69614985f8..7e8692c7e5 100755 --- a/sorc/ens_tracker.v1.1.15.2/jobs/JFV3_CYCLONE_TRACK_JP +++ b/sorc/ens_tracker.v1.1.15.2/jobs/JFV3_CYCLONE_TRACK_JP @@ -50,9 +50,8 @@ export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush} ############################## # Run setpdy and initialize PDY variables ############################## -#setpdy.sh -#. PDY -export PDY=20200612 +setpdy.sh +. PDY ############################################## # Define COM directories @@ -90,13 +89,10 @@ elif [[ -d /work ]] ; then # export COMINsyn=/work/noaa/global/kfriedma/glopara/git/tracker/syndat export COMINsyn=/work/noaa/global/Jiayi.Peng/syndat -elif [[ -d /lfs3 ]] ; then +elif [[ -d /lfs4 ]] ; then # We are on NOAA Jet -# export COMINgfs=${COMINgfs:-${COMROOTp1}/gfs/prod/gfs.${PDY}} -# export COMINsyn=${COMINsyn:-${COMROOTp1}/arch/prod/syndat} -# export COMINgfs=${COMINgfs:-/mnt/lfs3/projects/hwrfv3/Jiayi.Peng/data/gfs.${PDY}} + export COMINgfs=${COMINgfs:-${COMROOTp1}/gfs/prod/gfs.${PDY}} export COMINsyn=${COMINsyn:-/mnt/lfs4/HFIP/hwrf-data/hwrf-input/SYNDAT} - export COMINgfs=${COMINgfs:-/mnt/lfs4/HFIP/hwrfv3/Jiayi.Peng/data/gfs.20200612} else echo Job failed: unknown platform 1>&2 err_exit "FAILED ${jobid} - ERROR IN unknown platform - ABNORMAL EXIT" diff --git a/sorc/ens_tracker.v1.1.15.2/sorc/Module_ens_tracker.v1.1.15_for_Jet b/sorc/ens_tracker.v1.1.15.2/sorc/Module_ens_tracker.v1.1.15_for_Jet index a283de0005..85bba21a93 100644 --- a/sorc/ens_tracker.v1.1.15.2/sorc/Module_ens_tracker.v1.1.15_for_Jet +++ b/sorc/ens_tracker.v1.1.15.2/sorc/Module_ens_tracker.v1.1.15_for_Jet @@ -24,3 +24,8 @@ module load ip/v3.0.1 module load hdf5_parallel/1.10.6 module load netcdf_parallel/4.7.4 module load w3emc_para/v2.4.0 + +setenv NCEPLIBS /lfs4/HFIP/hfv3gfs/gwv/l0530/lib/ +module use -a /mnt/lfs4/HFIP/hfv3gfs/gwv/l0530/lib/modulefiles +module load esmflocal/8_0_1 +module load netcdfp/4.7.4 diff --git a/sorc/ens_tracker.v1.1.15.2/sorc/wsr_ecmwfens.fd/ecmwfensh.lst b/sorc/ens_tracker.v1.1.15.2/sorc/wsr_ecmwfens.fd/ecmwfensh.lst index 7d94d80c59..b947b08a07 100644 --- a/sorc/ens_tracker.v1.1.15.2/sorc/wsr_ecmwfens.fd/ecmwfensh.lst +++ b/sorc/ens_tracker.v1.1.15.2/sorc/wsr_ecmwfens.fd/ecmwfensh.lst @@ -1,5 +1,5 @@ Page 1 Source Listing -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f ecmwfensh.f(410): warning #8043: The extra characters in the format specification will be ignored. ['('kpdsread, ichk, jpds, jp... write (*,'(''kpdsread, ichk, jpds, jpds, rjpds ='', @@ -21,7 +21,7 @@ ecmwfensh.f(445): warning #8043: The extra characters in the format specificatio -----------------------------------------------------------------^ Page 2 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1 program ecmwfensh 2 C$$$ MAIN PROGRAM DOCUMENTATION BLOCK @@ -82,7 +82,7 @@ Page 2 Source Listing ECMWFENSH 57 C unit 171 - GRIB output for rh500 stats Page 3 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 58 C unit 72 - GRIB output for rh700 59 C unit 172 - GRIB output for rh700 stats @@ -143,7 +143,7 @@ Page 3 Source Listing ECMWFENSH 114 c lugb logical unit of the unblocked grib data file Page 4 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 115 c lugi logical unit of the unblocked grib index file 116 c @@ -204,7 +204,7 @@ Page 4 Source Listing ECMWFENSH 171 integer kholdz200pds(200) Page 5 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 172 integer kholdz500pds(200) 173 integer kholdz700pds(200) @@ -265,7 +265,7 @@ Page 5 Source Listing ECMWFENSH 228 real prcpmean(nlat*nlon),prcpspr(nlat*nlon) Page 6 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 229 real tcdcvals(numec,nlat*nlon) 230 real tcdcmean(nlat*nlon),tcdcspr(nlat*nlon) @@ -326,7 +326,7 @@ Page 6 Source Listing ECMWFENSH 285 rh500mean = 0.0 Page 7 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 286 rh500spr = 0.0 287 rh700vals = 0.0 @@ -387,7 +387,7 @@ Page 7 Source Listing ECMWFENSH 342 z700ct = 0 Page 8 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 343 z850ct = 0 344 z1000ct = 0 @@ -448,7 +448,7 @@ Page 8 Source Listing ECMWFENSH 399 write(*,76) (kgds(mm),mm=1,5) Page 9 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 400 write(*,77) (kgds(mm),mm=6,10) 401 write(*,78) (kgds(mm),mm=11,15) @@ -509,7 +509,7 @@ Page 9 Source Listing ECMWFENSH 441 endif Page 10 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 442 enddo 443 do ichk=6,200 @@ -570,7 +570,7 @@ Page 10 Source Listing ECMWFENSH 495 c write(*,76) (kgds(mm),mm=1,5) Page 11 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 496 c write(*,77) (kgds(mm),mm=6,10) 497 c write(*,78) (kgds(mm),mm=11,15) @@ -631,7 +631,7 @@ Page 11 Source Listing ECMWFENSH 552 newvar = 't700 ' Page 12 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 553 do i = 1,25 554 kholdt700pds(i) = kpds(i) @@ -692,7 +692,7 @@ Page 12 Source Listing ECMWFENSH 609 do ip = 1,kf Page 13 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 610 t2maxvals(t2maxct,ip) = t2maxvals(t2maxct,ip) + f(ip) 611 enddo @@ -753,7 +753,7 @@ Page 13 Source Listing ECMWFENSH 666 endif Page 14 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 667 tcdcct = tcdcct + 1 668 do ip = 1,kf @@ -814,7 +814,7 @@ Page 14 Source Listing ECMWFENSH 723 if (gotz200pds .eq. 'n') then Page 15 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 724 gotz200pds = 'y' 725 newvar = 'z200 ' @@ -875,7 +875,7 @@ Page 15 Source Listing ECMWFENSH 780 if (gotu500 .eq. 'n') then Page 16 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 781 gotu500 = 'y' 782 newvar = 'u500' @@ -936,7 +936,7 @@ Page 16 Source Listing ECMWFENSH 837 write(*,72) (kpds(mm),mm=6,10) Page 17 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 838 write(*,73) (kpds(mm),mm=11,15) 839 write(*,74) (kpds(mm),mm=16,20) @@ -997,7 +997,7 @@ Page 17 Source Listing ECMWFENSH 894 & ,lb,t700mean,t700spr) Page 18 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 895 else 896 print *,'no statistics for t700' @@ -1058,7 +1058,7 @@ Page 18 Source Listing ECMWFENSH 951 & ,lb,z500mean,z500spr) Page 19 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 952 else 953 print *,'no statistics for z500' @@ -1119,7 +1119,7 @@ Page 19 Source Listing ECMWFENSH 1008 call output_stats ('mslp',181,nlat*nlon,kholdmslppds,kgds Page 20 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1009 & ,lb,mslpmean,mslpspr) 1010 else @@ -1169,7 +1169,7 @@ Page 20 Source Listing ECMWFENSH 1054 end Page 21 Source Listing ECMWFENSH -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -1230,7 +1230,7 @@ SYMBOL CROSS REFERENCE GOTU10M Local 150 CHAR 1 scalar 795,796 Page 22 Source Listing ECMWFENSH -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f Name Object Declared Type Bytes Dimen Elements Attributes References @@ -1291,7 +1291,7 @@ Page 22 Source Listing ECMWFENSH KHOLDRH700PDS Local 177 I(4) 4 1 200 753,991 Page 23 Source Listing ECMWFENSH -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f Name Object Declared Type Bytes Dimen Elements Attributes References @@ -1352,7 +1352,7 @@ Page 23 Source Listing ECMWFENSH 9,200,201,202,203,204,205,206,207, Page 24 Source Listing ECMWFENSH -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f Name Object Declared Type Bytes Dimen Elements Attributes References @@ -1413,7 +1413,7 @@ Page 24 Source Listing ECMWFENSH T200CT Local 184 I(4) 4 scalar 331,581,583,876 Page 25 Source Listing ECMWFENSH -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f Name Object Declared Type Bytes Dimen Elements Attributes References @@ -1474,7 +1474,7 @@ Page 25 Source Listing ECMWFENSH Z850MEAN Local 214 R(8) 8 1 65160 278,965,967 Page 26 Source Listing ECMWFENSH -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f Name Object Declared Type Bytes Dimen Elements Attributes References @@ -1482,7 +1482,7 @@ Page 26 Source Listing ECMWFENSH Z850VALS Local 213 R(8) 8 2 3388320 277,696,965 Page 27 Source Listing ECMWFENSH -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1055 c 1056 c----------------------------------------------------------------------c @@ -1543,7 +1543,7 @@ Page 27 Source Listing ECMWFENSH 1111 Page 28 Source Listing CREATE_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1112 do imem = 1,nct 1113 do n = 1,npts @@ -1593,7 +1593,7 @@ Page 28 Source Listing CREATE_STATS 1157 end Page 29 Source Listing CREATE_STATS -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -1627,7 +1627,7 @@ SYMBOL CROSS REFERENCE XDIFFSQR Local 1132 R(8) 8 scalar 1132,1133 Page 30 Source Listing CREATE_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1158 c 1159 c----------------------------------------------------------------------c @@ -1688,7 +1688,7 @@ Page 30 Source Listing CREATE_STATS 1214 c 2 meter tmax 201 1 0 15 105 2 Page 31 Source Listing ADJPDS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1215 c 2 meter tmin 202 1 0 16 105 2 1216 c 2 meter td 168 1 0 17 105 2 @@ -1749,7 +1749,7 @@ Page 31 Source Listing ADJPDS 1271 if (kpds(7).eq.850) lugout = 54 Page 32 Source Listing ADJPDS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1272 else if (kpds(5).eq.131) then 1273 kpds(5) = 33 @@ -1810,7 +1810,7 @@ Page 32 Source Listing ADJPDS 1328 kpds(5) = 34 Page 33 Source Listing ADJPDS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1329 if (kpds(7).eq.0) then 1330 lugout = 110 @@ -1871,7 +1871,7 @@ Page 33 Source Listing ADJPDS 1385 endif Page 34 Source Listing ADJPDS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1386 c 1387 900 continue @@ -1915,7 +1915,7 @@ SYMBOL CROSS REFERENCE MEMBERCT Dummy 1162 I(4) 4 1 2 ARG,INOUT Page 35 Source Listing ADJPDS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1390 c 1391 c----------------------------------------------------------------------c @@ -1976,7 +1976,7 @@ Page 35 Source Listing ADJPDS 1446 c OUTPUT Page 36 Source Listing ADJEXT -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1447 c ------ 1448 c kens NCEP ensemble PDS extension (Bytes 41-45) @@ -2037,7 +2037,7 @@ Page 36 Source Listing ADJEXT 1503 end Page 37 Source Listing ADJEXT -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -2062,7 +2062,7 @@ SYMBOL CROSS REFERENCE MOD Func 1478 scalar 1478 Page 38 Source Listing ADJEXT -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1504 c 1505 c----------------------------------------------------------------------c @@ -2123,7 +2123,7 @@ Page 38 Source Listing ADJEXT 1560 call putgbe (lugout,kf,kpds,kgds,kens,ld,data,iret) Page 39 Source Listing OUTPUT -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1561 1562 if (iret.eq.0) then @@ -2168,7 +2168,7 @@ SYMBOL CROSS REFERENCE PUTGBE Subr 1560 1560 Page 40 Source Listing OUTPUT -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1579 c 1580 c----------------------------------------------------------------------c @@ -2229,7 +2229,7 @@ Page 40 Source Listing OUTPUT 1635 if (istat .eq. 1) ctype='mean' Page 41 Source Listing OUTPUT_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1636 if (istat .eq. 2) ctype='spr ' 1637 @@ -2290,7 +2290,7 @@ Page 41 Source Listing OUTPUT_STATS 1692 kpds(6) = 100 Page 42 Source Listing OUTPUT_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1693 kpds(7) = 500 1694 if (ctype .eq. 'mean') then @@ -2351,7 +2351,7 @@ Page 42 Source Listing OUTPUT_STATS 1749 kpds(22) = 1 Page 43 Source Listing OUTPUT_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1750 endif 1751 else if (cparm .eq. 'psfc') then @@ -2412,7 +2412,7 @@ Page 43 Source Listing OUTPUT_STATS 1806 write(*,71) (kpds(mm),mm=1,5) Page 44 Source Listing OUTPUT_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1807 write(*,72) (kpds(mm),mm=6,10) 1808 write(*,73) (kpds(mm),mm=11,15) @@ -2473,7 +2473,7 @@ Page 44 Source Listing OUTPUT_STATS 1863 print *,'IRET = 0 after call to putgbe in sub output_stats' Page 45 Source Listing OUTPUT_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1864 c c print *,' ' 1865 else @@ -2510,7 +2510,7 @@ ENTRY POINTS output_stats_ Page 46 Source Listing OUTPUT_STATS -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f @@ -2571,7 +2571,7 @@ SYMBOL CROSS REFERENCE ,1813,1814,1815 Page 47 Source Listing OUTPUT_STATS -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f Name Object Declared Type Bytes Dimen Elements Attributes References @@ -2581,7 +2581,7 @@ Page 47 Source Listing OUTPUT_STATS SRANGE Subr 1819 1819,1824 Page 48 Source Listing OUTPUT_STATS -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1890 c 1891 c----------------------------------------------------------------------c @@ -2642,7 +2642,7 @@ Page 48 Source Listing OUTPUT_STATS 1946 if (outmax.lt.1.0) then Page 49 Source Listing SRANGE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 1947 outmax = 1.0 1948 endif @@ -2703,7 +2703,7 @@ Page 49 Source Listing SRANGE 2003 if (outmin.gt.1.0) then Page 50 Source Listing SRANGE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2004 outmin = 1.0 2005 endif @@ -2736,7 +2736,7 @@ Page 50 Source Listing SRANGE 2032 end Page 51 Source Listing SRANGE -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -2792,7 +2792,7 @@ SYMBOL CROSS REFERENCE VAR Dummy 1894 R(8) 8 1 0 ARG,INOUT 1904,1905,1906,1914,1915,1924 Page 52 Source Listing SRANGE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2033 c 2034 c----------------------------------------------------------------------c @@ -2841,7 +2841,7 @@ Page 52 Source Listing SRANGE 2077 end Page 53 Source Listing GRANGE -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -2867,7 +2867,7 @@ SYMBOL CROSS REFERENCE N Dummy 2037 I(4) 4 scalar ARG,INOUT 2064,2069 Page 54 Source Listing GRANGE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2078 c 2079 c----------------------------------------------------------------------c @@ -2928,7 +2928,7 @@ Page 54 Source Listing GRANGE 2134 c Page 55 Source Listing GETGBECE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2135 c *********** CODE ADDED FOR ECMWF ORIGINAL ENSEMBLE FILES **** 2136 c @@ -2989,7 +2989,7 @@ Page 55 Source Listing GETGBECE 2191 C INTEGER KPTR(16) Page 56 Source Listing GETGBECE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2192 INTEGER KPTR(20) 2193 INTEGER IPDSP(LPDS),JPDSP(LPDS),IGDSP(LGDS),JGDSP(LGDS) @@ -3050,7 +3050,7 @@ Page 56 Source Listing GETGBECE 2248 LGRIB=0 Page 57 Source Listing GETGBECE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2249 KJ=J 2250 K=J @@ -3111,7 +3111,7 @@ Page 57 Source Listing GETGBECE 2305 LT=LT+ABS(JGDS(IP)-KGDS(IP)) Page 58 Source Listing GETGBECE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2306 ENDDO 2307 ENDIF @@ -3166,7 +3166,7 @@ Page 58 Source Listing GETGBECE 2356 END Page 59 Source Listing GETGBECE -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -3227,7 +3227,7 @@ SYMBOL CROSS REFERENCE ,2337,2341 Page 60 Source Listing GETGBECE -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f Name Object Declared Type Bytes Dimen Elements Attributes References @@ -3261,7 +3261,7 @@ Page 60 Source Listing GETGBECE W3FI63 Subr 2337 2337 Page 61 Source Listing GETGBECE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2357 c 2358 C----------------------------------------------------------------------c @@ -3322,7 +3322,7 @@ Page 61 Source Listing GETGBECE 2413 C Page 62 Source Listing ECMEXT -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2414 C$$$ 2415 C @@ -3378,7 +3378,7 @@ Page 62 Source Listing ECMEXT 2465 END Page 63 Source Listing ECMEXT -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -3418,7 +3418,7 @@ SYMBOL CROSS REFERENCE XPROB Local 2418 R(8) 8 1 2 Page 64 Source Listing ECMEXT -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2466 c 2467 c----------------------------------------------------------------------c @@ -3479,7 +3479,7 @@ Page 64 Source Listing ECMEXT 2522 Page 65 Source Listing GRIB_CLOSE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2523 unitname(1:11) = "XLFUNIT_ " 2524 if (lug.lt.100) then @@ -3517,7 +3517,7 @@ ENTRY POINTS grib_close_ Page 66 Source Listing GRIB_CLOSE -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f @@ -3535,7 +3535,7 @@ SYMBOL CROSS REFERENCE UNITNAME Local 2520 CHAR 11 scalar 2523,2525,2527,2529 Page 67 Source Listing GRIB_CLOSE -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2550 c 2551 c----------------------------------------------------------------------c @@ -3596,7 +3596,7 @@ Page 67 Source Listing GRIB_CLOSE 2606 Page 68 Source Listing GRIB_OPEN -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2607 c unitname(1:8) = "XLFUNIT_" 2608 unitname(1:11) = "XLFUNIT_ " @@ -3629,7 +3629,7 @@ Page 68 Source Listing GRIB_OPEN 2635 end Page 69 Source Listing GRIB_OPEN -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -3654,7 +3654,7 @@ SYMBOL CROSS REFERENCE UNITNAME Local 2604 CHAR 11 scalar 2608,2610,2612,2615 Page 70 Source Listing GRIB_OPEN -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2636 c 2637 c----------------------------------------------------------------------c @@ -3715,7 +3715,7 @@ Page 70 Source Listing GRIB_OPEN 2692 character fname*80 Page 71 Source Listing GRIB_OPEN_WA -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2693 2694 c unitname(1:8) = "XLFUNIT_" @@ -3749,7 +3749,7 @@ Page 71 Source Listing GRIB_OPEN_WA 2722 end Page 72 Source Listing GRIB_OPEN_WA -2020-06-15 22:06 Entry Points ecmwfensh.f +2020-06-22 00:51 Entry Points ecmwfensh.f @@ -3774,7 +3774,7 @@ SYMBOL CROSS REFERENCE UNITNAME Local 2691 CHAR 11 scalar 2695,2697,2699,2702 Page 73 Source Listing GRIB_OPEN_WA -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2723 c 2724 c----------------------------------------------------------------------c @@ -3835,7 +3835,7 @@ Page 73 Source Listing GRIB_OPEN_WA 2779 c write(unitname(9:10),'(I2)') lug Page 74 Source Listing GRIB_OPEN_R -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f 2780 call getenv(unitname,fname) 2781 c print *,' ' @@ -3867,7 +3867,7 @@ ENTRY POINTS grib_open_r_ Page 75 Source Listing GRIB_OPEN_R -2020-06-15 22:06 Symbol Table ecmwfensh.f +2020-06-22 00:51 Symbol Table ecmwfensh.f @@ -3885,7 +3885,7 @@ SYMBOL CROSS REFERENCE UNITNAME Local 2769 CHAR 11 scalar 2773,2775,2777,2780 Page 76 Source Listing GRIB_OPEN_R -2020-06-15 22:06 Subprograms/Common Blocks ecmwfensh.f +2020-06-22 00:51 Subprograms/Common Blocks ecmwfensh.f @@ -3946,7 +3946,7 @@ COMPILER OPTIONS BEING USED -check nopointers -check noshape Page 77 Source Listing GRIB_OPEN_R -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f -check nostack -check nouninitialized -coarray-num-procs 0 no -coarray-config-file @@ -4007,7 +4007,7 @@ Page 77 Source Listing GRIB_OPEN_R Page 78 Source Listing GRIB_OPEN_R -2020-06-15 22:06 ecmwfensh.f +2020-06-22 00:51 ecmwfensh.f -includepath : /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/tbb/include/,/usr/local/include/, .f,./.f,/apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/ipp/include/.f,/apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/mkl/include/.f, diff --git a/ush/rocoto/ffexp.sh b/ush/rocoto/ffexp.sh deleted file mode 100755 index 42ee3e7dc6..0000000000 --- a/ush/rocoto/ffexp.sh +++ /dev/null @@ -1,32 +0,0 @@ -USER=Judy.K.Henderson -GITDIR=/home/Judy.K.Henderson/scratch/test_port2orion/ ## where your git checkout is located -COMROT=$GITDIR/FV3GFSrun ## default COMROT directory -EXPDIR=$GITDIR/FV3GFSwfm ## default EXPDIR directory - -# ICSDIR is assumed to be under $COMROT/FV3ICS -#cp $GITDIR/parm/config/config.base.emc.dyn $GITDIR/parm/config/config.base - -PSLOT=ffexp -IDATE=2020060100 -EDATE=2020060100 -RESDET=768 ## 96 192 384 768 - -### gfs_cyc 1 00Z only; gfs_cyc 2 00Z and 12Z - -./setup_expt_fcstonly_gsd.py --pslot $PSLOT \ - --gfs_cyc 1 --idate $IDATE --edate $EDATE \ - --configdir $GITDIR/parm/config \ - --res $RESDET --comrot $COMROT --expdir $EXPDIR - -#for running chgres, forecast, and post -./setup_workflow_fcstonly_gsd.py --expdir $EXPDIR/$PSLOT - -## call jobs/rocoto/makefv3ic_link.sh for fv3ic task -#sed -i "s/fv3ic.sh/makefv3ic_link.sh/" $EXPDIR/$PSLOT/$PSLOT.xml -# call jobs/rocoto/arch_gsd.sh for gfsarch task -sed -i "s/arch.sh/arch_gsd.sh/" $EXPDIR/$PSLOT/$PSLOT.xml - -# use config.nsst_gsd values -cp $GITDIR/parm/config/config.nsst_gsd $EXPDIR/$PSLOT/config.nsst - - diff --git a/ush/rocoto/setup_expt_fcstonly_gsd.py b/ush/rocoto/setup_expt_fcstonly_gsd.py index d41360cb3d..d9c43ae207 100755 --- a/ush/rocoto/setup_expt_fcstonly_gsd.py +++ b/ush/rocoto/setup_expt_fcstonly_gsd.py @@ -115,6 +115,7 @@ def edit_baseconfig(): parser.add_argument('--configdir', help='full path to directory containing the config files', type=str, required=False, default=None) parser.add_argument('--gfs_cyc', help='GFS cycles to run', type=int, choices=[0, 1, 2, 4], default=1, required=False) parser.add_argument('--partition', help='partition on machine', type=str, required=False, default=None) + parser.add_argument('--start', help='restart mode: warm or cold', type=str, choices=['warm', 'cold'], required=False, default='cold') args = parser.parse_args() @@ -132,6 +133,13 @@ def edit_baseconfig(): expdir = args.expdir if args.expdir is None else os.path.join(args.expdir, pslot) gfs_cyc = args.gfs_cyc partition = args.partition + start = args.start + + # Set restart setting in config.base + if start == 'cold': + exp_warm_start = '.false.' + elif start == 'warm': + exp_warm_start = '.true.' # Set machine defaults if machine == 'WCOSS_DELL_P3': @@ -152,7 +160,6 @@ def edit_baseconfig(): queue_service = 'dev2_transfer' chgrp_rstprod = 'YES' chgrp_cmd = 'chgrp rstprod' - exp_warm_start = '.false.' elif machine == 'WCOSS_C': base_git = '/gpfs/hps3/emc/global/noscrub/emc.glopara/git' base_svn = '/gpfs/hps3/emc/global/noscrub/emc.glopara/svn' @@ -168,7 +175,6 @@ def edit_baseconfig(): partition_batch = '' chgrp_rstprod = 'YES' chgrp_cmd = 'chgrp rstprod' - exp_warm_start = '.false.' elif machine == 'HERA': base_git = '/scratch1/NCEPDEV/global/glopara/git' base_svn = '/scratch1/NCEPDEV/global/glopara/svn' @@ -184,7 +190,6 @@ def edit_baseconfig(): partition_batch = '' chgrp_rstprod = 'YES' chgrp_cmd = 'chgrp rstprod' - exp_warm_start = '.false.' elif machine == 'JET': base_git = '/lfs4/HFIP/hfv3gfs/glopara/git' base_svn = '/dev/null/global/save/glopara/svn/' @@ -204,10 +209,10 @@ def edit_baseconfig(): chgrp_cmd = 'chgrp rstprrod' exp_warm_start = '.false.' elif machine == 'ORION': - base_git = '/work/noaa/global/kfriedma/glopara/git' - base_svn = '/work/noaa/global/kfriedma/glopara/svn' - dmpdir = '/work/noaa/global/kfriedma/glopara/dump' - nwprod = '/work/noaa/global/kfriedma/glopara/nwpara' + base_git = '/work/noaa/global/glopara/git' + base_svn = '/work/noaa/global/glopara/svn' + dmpdir = '/work/noaa/global/glopara/dump' + nwprod = '/work/noaa/global/glopara/nwpara' homedir = '/work/noaa/global/$USER' stmp = '/work/noaa/stmp/$USER' ptmp = '/work/noaa/stmp/$USER' @@ -218,7 +223,6 @@ def edit_baseconfig(): partition_batch = 'orion' chgrp_rstprod = 'NO' # No rstprod on Orion chgrp_cmd = 'ls' - exp_warm_start = '.false.' # COMROT directory create_comrot = True