[Dart-dev] DART/branches Revision: 12373

[dart at ucar.edu]

mizzi at ucar.edu
2018-01-22 16:18:51 -0700 (Mon, 22 Jan 2018)
39
Commit update for running on Cheyenne




Modified: DART/branches/mizzi/mkmf/mkmf.template
===================================================================
--- DART/branches/mizzi/mkmf/mkmf.template	2018-01-22 18:34:56 UTC (rev 12372)
+++ DART/branches/mizzi/mkmf/mkmf.template	2018-01-22 23:18:51 UTC (rev 12373)
@@ -128,9 +128,9 @@
 #FFLAGS  = -g -C -CB -ftz -vec-report0 -mcmodel=medium -shared-intel -fp-model precise $(INCS)
 #
 # for development or debugging, use this instead:
- FFLAGS = -g -C -CB -check noarg_temp_created -fpe0 -mcmodel=large -shared-intel \
+ FFLAGS = -g -C -check noarg_temp_created -fpe0 -mcmodel=large -shared-intel \
           -fp-model precise  -ftrapuv -traceback \
-          -warn argument_checking,declarations,uncalled,unused $(INCS)
+          -warn declarations,uncalled,unused $(INCS)
  LDFLAGS = $(FFLAGS) $(LIBS)
 #
 # for speed on yellowstone (verify against a run with with -O and -fp-model precise

Modified: DART/branches/mizzi/models/wrf_chem/hybrid_scripts/da_run_hold.ksh
===================================================================
--- DART/branches/mizzi/models/wrf_chem/hybrid_scripts/da_run_hold.ksh	2018-01-22 18:34:56 UTC (rev 12372)
+++ DART/branches/mizzi/models/wrf_chem/hybrid_scripts/da_run_hold.ksh	2018-01-22 23:18:51 UTC (rev 12373)
@@ -3,11 +3,11 @@
 # Script to hold script execution until all jobs 
 # with the $1 job name have completed on bluefire
 #   
-bjobs > job_list
+qstat -u ${USER} > job_list
 grep $1 job_list > test_list
 while [[ -s test_list ]]; do
    sleep 30
-   bjobs > job_list
+   qstat -u ${USER} > job_list
    grep "$1" job_list > test_list
 done
 rm job_list test_list

Modified: DART/branches/mizzi/models/wrf_chem/run_scripts/RUN_PERT_CHEM/ICBC_PERT/mozbc-dart/make_mozbc
===================================================================
--- DART/branches/mizzi/models/wrf_chem/run_scripts/RUN_PERT_CHEM/ICBC_PERT/mozbc-dart/make_mozbc	2018-01-22 18:34:56 UTC (rev 12372)
+++ DART/branches/mizzi/models/wrf_chem/run_scripts/RUN_PERT_CHEM/ICBC_PERT/mozbc-dart/make_mozbc	2018-01-22 23:18:51 UTC (rev 12373)
@@ -1,10 +1,10 @@
 #!/bin/csh
 
-set NETCDF_DIR=/glade/apps/opt/netcdf/4.3.0/pgi/13.3
 set OP_SYS=`uname -s`
 if( ! $?FC ) then
   if( $OP_SYS == "Linux" ) then
     setenv FC pgf90
+    setenv FC ifort
   else
     setenv FC xlf90
   endif
@@ -27,7 +27,7 @@
 #  check for netcdf library
 #------------------------------------------------------------
   set found_ncf_lib = 0
-  foreach tst_dir (/usr/local /usr /opt)
+  foreach tst_dir (/glade/u/apps/ch/opt /usr/local /usr /opt)
     foreach tst_lib (lib64 lib netcdf)
       if( -e $tst_dir/$tst_lib/libnetcdf.a ) then
          set found_ncf_lib = 1

Modified: DART/branches/mizzi/models/wrf_chem/run_scripts/RUN_PERT_CHEM/ICBC_PERT/runICBC_setN_rt_CR.ksh
===================================================================
--- DART/branches/mizzi/models/wrf_chem/run_scripts/RUN_PERT_CHEM/ICBC_PERT/runICBC_setN_rt_CR.ksh	2018-01-22 18:34:56 UTC (rev 12372)
+++ DART/branches/mizzi/models/wrf_chem/run_scripts/RUN_PERT_CHEM/ICBC_PERT/runICBC_setN_rt_CR.ksh	2018-01-22 23:18:51 UTC (rev 12373)
@@ -7,34 +7,25 @@
 export IC_METDIR=${WRFCHEM_MET_IC_DIR}
 export BC_METDIR=${WRFCHEM_MET_BC_DIR}
 export CHEMDIR=${RUN_DIR}/${YEAR}${MONTH}${DAY}${HOUR}/wrfchem_chem_icbc
-for ((i = 1; i <= ${NUM_MEMBERS}; i += 1))
-do
-   if [ "$i" -lt "10"  ]; then 
-      export IENS="00"${i}
-   fi
-   if [ "$i" -lt "100"  ]; then
-      if [ "$i" -ge "10"  ]; then
-         export IENS="0"${i}
-      fi
-   fi
-   if [ "$i" -lt "1000"  ]; then
-      if [ "$i" -ge "100"  ]; then
-         export IENS=${i}
-      fi
-   fi
+let MEM=1
+while [[ ${MEM} -le  ${NUM_MEMBERS} ]]; do
+   export IENS=${MEM}
+   if [[ ${MEM} -lt 100 ]]; then export IENS=0${MEM}; fi
+   if [[ ${MEM} -lt 10  ]]; then export IENS=00${MEM}; fi
    export WRFINP=wrfinput_d01_${YEAR}-${MONTH}-${DAY}_${HOUR}:00:00.e${IENS}
    export WRFBDY=wrfbdy_d01_${YEAR}-${MONTH}-${DAY}_${HOUR}:00:00.e${IENS}
    echo 'get inp'
    cp ${IC_METDIR}/${WRFINP} ./.
    cp ${BC_METDIR}/${WRFBDY} ./.
-   ls set${i}
-   rm -f mozbc.ic.inp.set${i}
-   cat mozbc.ic.inp set${i} > mozbc.ic.inp.set${i}
-   rm -f mozbc.bc.inp.set${i}
-   cat mozbc.bc.inp set${i} > mozbc.bc.inp.set${i}
+   ls set${MEM}