Merge remote branch 'origin/master' into jm2/ign

Conflicts:
	wrfv2_fire/Registry/registry.fire

wrfv2_fire/Registry/registry.fire

@@ -8,7 +8,7 @@
 #<key>   <package       <associated               <package        <associated 4d scalars>
 #         name>          namelist choice>          state vars>
 # 
-package   fire_sfire    ifire==2                    -             state:nfuel_cat,zsf,tign_g,rthfrten,rqvfrten,grnhfx,grnqfx,canhfx,canqfx,lfn,fuel_frac,fire_area,uf,vf,fgrnhfx,fgrnqfx,fcanhfx,fcanhfx,fcanqfx,ros,fxlong,fxlat,fuel_time,bbb,betafl,phiwc,r_0,fgip,ischap
+package   fire_sfire    ifire==2                    -             state:nfuel_cat,zsf,tign_g,rthfrten,rqvfrten,grnhfx,grnqfx,canhfx,canqfx,lfn,fuel_frac,fire_area,uf,vf,fgrnhfx,fgrnqfx,fcanhfx,fcanhfx,fcanqfx,ros,fxlong,fxlat,fuel_time,bbb,phiwc,phisc,r_0,fgip,ischap
 
 # fire variables on fire grid
 #
@@ -208,7 +208,7 @@ halo      HALO_FIRE_WIND_F dyn_em 12:uf,vf
 halo      HALO_FIRE_LONGLAT dyn_em 24:xlong,xlat
 halo      HALO_FIRE_WIND_A dyn_em 8:u_2,v_2
 halo      HALO_FIRE_ZSF dyn_em 24:zsf
-halo      HALO_FIRE_FUEL dyn_em 8:fuel_frac,fuel_time,bbb,betafl,phiwc,r_0,fgip,ischap,nfuel_cat,dzdxf,dzdyf
+halo      HALO_FIRE_FUEL dyn_em 8:fuel_frac,fuel_time,bbb,phiwc,phisc,r_0,fgip,ischap,nfuel_cat,dzdxf,dzdyf
 #
 # ----------------------------------------
 #  end fire variables and configuration

wrfv2_fire/test/em_fire/hill/1x7.pbs

@@ -0,0 +1,44 @@
+#!/bin/bash
+# copy this script to your run directory and modify as desired
+
+# Set the number of nodes and processes per node
+# each node contains 12 processing cores
+#PBS -l nodes=1:ppn=1
+
+# Set the maximum amount of the time the job will run (HH:MM:SS)
+#PBS -l walltime=06:00:00
+
+# Give the job a name
+#PBS -N hill_1x7 
+
+# Keep all environment variables from the current session (PATH, LD_LIBRARY_PATH, etc)
+#PBS -V
+
+# Merge stderr and stdout
+#PBS -j oe
+
+# Set log file
+#PBS -o 1x7.log
+
+# Change to the run directory (where job was submitted)
+cd $PBS_O_WORKDIR
+
+WD=1x7
+rm -rf $WD
+mkdir $WD
+cd $WD
+pwd
+ln -s ../ideal.exe .
+#ln -s ../input_fc .
+#ln -s ../input_ht .
+#ln -s ../input_lu .
+ln -s ../input_sounding .
+#ln -s ../LANDUSE.TBL .
+ln -s ../namelist.fire .
+ln -s ../namelist.input .
+ln -s ../wrf.exe .
+
+cat $PBS_NODEFILE | sort -u > nodes 
+mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
+mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=7 ./wrf.exe 
+

wrfv2_fire/test/em_fire/hill/3x3.pbs

@@ -0,0 +1,44 @@
+#!/bin/bash
+# copy this script to your run directory and modify as desired
+
+# Set the number of nodes and processes per node
+# each node contains 12 processing cores
+#PBS -l nodes=1:ppn=1
+
+# Set the maximum amount of the time the job will run (HH:MM:SS)
+#PBS -l walltime=06:00:00
+
+# Give the job a name
+#PBS -N hill_3x3 
+
+# Keep all environment variables from the current session (PATH, LD_LIBRARY_PATH, etc)
+#PBS -V
+
+# Merge stderr and stdout
+#PBS -j oe
+
+# Set log file
+#PBS -o 3x3.log
+
+# Change to the run directory (where job was submitted)
+cd $PBS_O_WORKDIR
+
+WD=3x3
+rm -rf $WD
+mkdir $WD
+cd $WD
+pwd
+ln -s ../ideal.exe .
+#ln -s ../input_fc .
+#ln -s ../input_ht .
+#ln -s ../input_lu .
+ln -s ../input_sounding .
+#ln -s ../LANDUSE.TBL .
+ln -s ../namelist.fire .
+ln -s ../namelist.input .
+ln -s ../wrf.exe .
+
+cat $PBS_NODEFILE | sort -u > nodes 
+mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
+mpirun_rsh -np 3 -hostfile nodes OMP_NUM_THREADS=3 ./wrf.exe 
+