Merge branch 'master' into jm2/master

openwfm · Mar 31, 2011 · 03bb9bb · 03bb9bb
2 parents 9b5be2e + bc22568
commit 03bb9bb
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 16 deletions.
diff --git a/wrfv2_fire/Registry/registry.fire b/wrfv2_fire/Registry/registry.fire
@@ -140,7 +140,7 @@ rconfig   integer fire_sprd_mdl          namelist,fire         max_domains
 rconfig   real    fire_crwn_hgt          namelist,fire         max_domains           15.     -      "fire_crwn_hgt"    "height that heat from crown fire is released" "m"
 rconfig   real    fire_ext_grnd          namelist,fire         max_domains           50.     -      "fire_ext_grnd"    "extinction depth of sfc fire heat"   "m"
 rconfig   real    fire_ext_crwn          namelist,fire         max_domains           50.     -      "fire_ext_crwn"    "extinction depth of crown fire heat" "m"
-rconfig   integer fire_wind_log_interp   namelist,fire         max_domains           1       -      "fire_wind_log_interp"    "kind of vertical wind interpolation from log boundary layer""   ""
+rconfig   integer fire_wind_log_interp   namelist,fire         max_domains           4       -      "fire_wind_log_interp"    "kind of vertical wind interpolation from log boundary layer""   ""
 rconfig   integer fire_fuel_read         namelist,fire         max_domains           -1      -      "fire_fuel_read"   "fuel categories are set by: if 0, uniform; if 1, user-presc; if 2, read from file"   ""
 rconfig   integer fire_fuel_cat          namelist,fire         max_domains           1       -      "fire_fuel_cat"     "fuel category if ifuelread=0"              ""
 # sfire switches

diff --git a/wrfv2_fire/phys/module_fr_sfire_atm.F b/wrfv2_fire/phys/module_fr_sfire_atm.F
@@ -920,10 +920,6 @@ subroutine interpolate_wind2fire_height(id,       & ! to identify debugging prin
   call message(msg)
 !$OMP END CRITICAL(SFIRE_ATM_CRIT)
 
-  call print_chsum(id,ifms,ifme,1,1,jfms,jfme,ifds,ifde,1,1,jfds,jfde,ifps,ifpe,1,1,jfps,jfpe,0,0,0,uf,'uf')
-  call print_chsum(id,ifms,ifme,1,1,jfms,jfme,ifds,ifde,1,1,jfds,jfde,ifps,ifpe,1,1,jfps,jfpe,0,0,0,vf,'vf')
-
-
   return
 
   91 call crash('interpolate_wind2fire_height: fire wind height too large, increase kdmax or atm height')

diff --git a/wrfv2_fire/test/em_fire/hill/12x1.pbs b/wrfv2_fire/test/em_fire/hill/12x1.pbs
@@ -45,6 +45,7 @@ fi
 #cat $PBS_NODEFILE | sort -u > nodes 
 cat $PBS_NODEFILE > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 12 -hostfile nodes OMP_NUM_THREADS=1 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/1x1.pbs b/wrfv2_fire/test/em_fire/hill/1x1.pbs
@@ -44,6 +44,7 @@ fi
 
 cat $PBS_NODEFILE | sort -u > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/1x12.pbs b/wrfv2_fire/test/em_fire/hill/1x12.pbs
@@ -45,6 +45,7 @@ fi
 
 cat $PBS_NODEFILE | sort -u > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=12 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/1x7.pbs b/wrfv2_fire/test/em_fire/hill/1x7.pbs
@@ -45,6 +45,7 @@ fi
 
 cat $PBS_NODEFILE | sort -u > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=7 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/24x1.pbs b/wrfv2_fire/test/em_fire/hill/24x1.pbs
@@ -0,0 +1,51 @@
+#!/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=2:ppn=12
+
+# 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_24x1
+
+# 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 24x1.log
+
+# Change to the run directory (where job was submitted)
+cd $PBS_O_WORKDIR
+
+WD=24x1
+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 .
+if [ -e ../input_tign_g ]
+then
+  ln -s ../input_tign_g .
+fi
+
+
+cat $PBS_NODEFILE > nodes 
+mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
+mpirun_rsh -np 24 -hostfile nodes OMP_NUM_THREADS=1 ./wrf.exe 
+
diff --git a/wrfv2_fire/test/em_fire/hill/2x3.pbs b/wrfv2_fire/test/em_fire/hill/2x3.pbs
@@ -45,6 +45,7 @@ fi
 
 cat $PBS_NODEFILE  > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 2 -hostfile nodes OMP_NUM_THREADS=3 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/2x6.pbs b/wrfv2_fire/test/em_fire/hill/2x6.pbs
@@ -45,6 +45,7 @@ fi
 
 cat $PBS_NODEFILE  > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 2 -hostfile nodes OMP_NUM_THREADS=6 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/3x3.pbs b/wrfv2_fire/test/em_fire/hill/3x3.pbs
@@ -45,6 +45,7 @@ fi
 cat $PBS_NODEFILE | sort -u > node 
 cat node node node > nodes
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 3 -hostfile nodes OMP_NUM_THREADS=3 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/4x6.pbs b/wrfv2_fire/test/em_fire/hill/4x6.pbs
@@ -46,6 +46,7 @@ fi
 cat $PBS_NODEFILE | sort -u  > unodes
 cat unodes unodes > nodes
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 4 -hostfile nodes OMP_NUM_THREADS=6 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/5x2.pbs b/wrfv2_fire/test/em_fire/hill/5x2.pbs
@@ -45,6 +45,7 @@ fi
 
 cat $PBS_NODEFILE  > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 5 -hostfile nodes OMP_NUM_THREADS=2 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/6x2.pbs b/wrfv2_fire/test/em_fire/hill/6x2.pbs
@@ -45,6 +45,7 @@ fi
 
 cat $PBS_NODEFILE  > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
-mv rsl.error.0000 ideal.log
+mv rsl.error.0000 ideal.error.log
+mv rsl.out.0000 ideal.out.log
 mpirun_rsh -np 6 -hostfile nodes OMP_NUM_THREADS=2 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/namelist.input.hill b/wrfv2_fire/test/em_fire/hill/namelist.input.hill
@@ -177,7 +177,7 @@
 !
 ! method switches for developers only, do not change!
 !
- fuel_using_z0 = 1,             ! 0 = from fuel categores, 1=constant from atm, 2=bilinear from atm, 3=interpolation and wind reduction per Behave
+ fire_wind_log_interp = 1,      ! 1 = from fuel categores, 2=constant from atm, 3=bilinear from atm, 4=interpolation and wind reduction per Behave
  fire_boundary_guard = -1,      ! integer, number of cells to stop when fire close to the domain boundary, -1 turn off
  fire_fuel_left_irl=2,          ! refinement to integrate fuel_left, must be even
  fire_fuel_left_jrl=2,          ! refinement to integrate fuel_left, must be even