From 4c4c93e3df049d19d7911824518870e060412594 Mon Sep 17 00:00:00 2001
From: Jan Mandel <jmandel@frontend.cluster>
Date: Thu, 24 Mar 2011 20:30:53 -0600
Subject: [PATCH] fixing pbs scripts in hill directory

---
 wrfv2_fire/test/em_fire/hill/12x1.pbs |  5 +++++
 wrfv2_fire/test/em_fire/hill/1x1.pbs  |  5 +++++
 wrfv2_fire/test/em_fire/hill/1x12.pbs |  6 ++++++
 wrfv2_fire/test/em_fire/hill/1x7.pbs  |  8 +++++++-
 wrfv2_fire/test/em_fire/hill/2x3.pbs  |  6 ++++++
 wrfv2_fire/test/em_fire/hill/2x6.pbs  |  6 ++++++
 wrfv2_fire/test/em_fire/hill/3x3.pbs  | 10 ++++++++--
 wrfv2_fire/test/em_fire/hill/4x6.pbs  |  6 ++++++
 wrfv2_fire/test/em_fire/hill/5x2.pbs  |  6 ++++++
 wrfv2_fire/test/em_fire/hill/6x2.pbs  |  6 ++++++
 10 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/wrfv2_fire/test/em_fire/hill/12x1.pbs b/wrfv2_fire/test/em_fire/hill/12x1.pbs
index 2be8c0c6..8a604063 100644
--- a/wrfv2_fire/test/em_fire/hill/12x1.pbs
+++ b/wrfv2_fire/test/em_fire/hill/12x1.pbs
@@ -37,9 +37,14 @@ ln -s ../input_sounding .
 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 | sort -u > nodes 
 cat $PBS_NODEFILE > nodes 
 mpirun -np 1 -hostfile nodes ./ideal.exe 
+mv rsl.error.0000 ideal.log
 mpirun -np 12 -hostfile nodes ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/1x1.pbs b/wrfv2_fire/test/em_fire/hill/1x1.pbs
index 96ac267c..104c1a2e 100644
--- a/wrfv2_fire/test/em_fire/hill/1x1.pbs
+++ b/wrfv2_fire/test/em_fire/hill/1x1.pbs
@@ -37,8 +37,13 @@ ln -s ../input_sounding .
 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 | sort -u > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
+mv rsl.error.0000 ideal.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
index 06a48f7c..4642cc99 100644
--- a/wrfv2_fire/test/em_fire/hill/1x12.pbs
+++ b/wrfv2_fire/test/em_fire/hill/1x12.pbs
@@ -37,8 +37,14 @@ ln -s ../input_sounding .
 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 | sort -u > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
+mv rsl.error.0000 ideal.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
index d0387edd..1985075d 100644
--- a/wrfv2_fire/test/em_fire/hill/1x7.pbs
+++ b/wrfv2_fire/test/em_fire/hill/1x7.pbs
@@ -3,7 +3,7 @@
 
 # Set the number of nodes and processes per node
 # each node contains 12 processing cores
-#PBS -l nodes=1:ppn=1
+#PBS -l nodes=1:ppn=7
 
 # Set the maximum amount of the time the job will run (HH:MM:SS)
 #PBS -l walltime=06:00:00
@@ -37,8 +37,14 @@ ln -s ../input_sounding .
 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 | sort -u > nodes 
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=1 ./ideal.exe 
+mv rsl.error.0000 ideal.log
 mpirun_rsh -np 1 -hostfile nodes OMP_NUM_THREADS=7 ./wrf.exe 
 
diff --git a/wrfv2_fire/test/em_fire/hill/2x3.pbs b/wrfv2_fire/test/em_fire/hill/2x3.pbs
index a8b5accb..dafbbe62 100644
--- a/wrfv2_fire/test/em_fire/hill/2x3.pbs
+++ b/wrfv2_fire/test/em_fire/hill/2x3.pbs
@@ -37,8 +37,14 @@ ln -s ../input_sounding .
 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.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
index cb2e6651..55159e8d 100644
--- a/wrfv2_fire/test/em_fire/hill/2x6.pbs
+++ b/wrfv2_fire/test/em_fire/hill/2x6.pbs
@@ -37,8 +37,14 @@ ln -s ../input_sounding .
 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.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
index d31f4d83..54d95274 100644
--- a/wrfv2_fire/test/em_fire/hill/3x3.pbs
+++ b/wrfv2_fire/test/em_fire/hill/3x3.pbs
@@ -3,7 +3,7 @@
 
 # Set the number of nodes and processes per node
 # each node contains 12 processing cores
-#PBS -l nodes=1:ppn=1
+#PBS -l nodes=1:ppn=9
 
 # Set the maximum amount of the time the job will run (HH:MM:SS)
 #PBS -l walltime=06:00:00
@@ -37,8 +37,14 @@ ln -s ../input_sounding .
 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 | sort -u > nodes 
+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
 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
index 182a934f..4be2c966 100644
--- a/wrfv2_fire/test/em_fire/hill/4x6.pbs
+++ b/wrfv2_fire/test/em_fire/hill/4x6.pbs
@@ -37,9 +37,15 @@ ln -s ../input_sounding .
 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 | 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
 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
index f19059fc..20d6fc9a 100644
--- a/wrfv2_fire/test/em_fire/hill/5x2.pbs
+++ b/wrfv2_fire/test/em_fire/hill/5x2.pbs
@@ -37,8 +37,14 @@ ln -s ../input_sounding .
 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.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
index 3d776cf1..f8eebd9e 100644
--- a/wrfv2_fire/test/em_fire/hill/6x2.pbs
+++ b/wrfv2_fire/test/em_fire/hill/6x2.pbs
@@ -37,8 +37,14 @@ ln -s ../input_sounding .
 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.log
 mpirun_rsh -np 6 -hostfile nodes OMP_NUM_THREADS=2 ./wrf.exe