# HG changeset patch
# User Forrest Hoffman <forrest@climatemodeling.org>
# Date 1222185827 14400
# Node ID 2bbb71ef2f671e74f2aeb7ffe883bbfd1528965a
# Parent  c8ca04c3a9d603d280e2771f4cecf190383621e9
Fixed unit conversion for SOILPSI (wpsl) and regenerated files. Changed path to CMOR table in namelist files.

diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 clm_mod.f90
--- a/clm_mod.f90	Sun Sep 21 21:59:01 2008 -0400
+++ b/clm_mod.f90	Tue Sep 23 12:03:47 2008 -0400
@@ -1059,8 +1059,8 @@
         var_data%out_varname = 'vfwsl'
       ! wpsl (multi-level)
       case ('SOILPSI')
-        ! SOILPSI: Pa -> Pa
-        sfactor = 1.0
+        ! SOILPSI: MPa -> Pa
+        sfactor = 1.0e+6
         var_data%units = 'Pa'
         var_data%out_varname = 'wpsl'
 
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_casa.exp1_2.run1.monthly_mean
--- a/namelist.clm3_casa.exp1_2.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_casa.exp1_2.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_casa/exp1_2/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip05_clm3_expa_72); CASA' biogeochemistry"
  experiment  = 'Experiment 1.2 (Control)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_casa.exp1_3.run1.monthly_mean
--- a/namelist.clm3_casa.exp1_3.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_casa.exp1_3.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_casa/exp1_3/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip05_clm3_expa_72); CASA' biogeochemistry"
  experiment  = 'Experiment 1.3 (Varying Climate)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_casa.exp1_4.run1.monthly_mean
--- a/namelist.clm3_casa.exp1_4.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_casa.exp1_4.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_casa/exp1_4/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip05_clm3_expa_72); CASA' biogeochemistry"
  experiment  = 'Experiment 1.4 (Varying Climate, CO2, and N Deposition)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_casa.exp1_6.run1.monthly_mean
--- a/namelist.clm3_casa.exp1_6.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_casa.exp1_6.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_casa/exp1_6/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip08_clm3_expa_72); CASA' biogeochemistry"
  experiment  = 'Experiment 1.6 (FACE Control varying Climate, CO2, and N Deposition)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_casa.exp1_7.run1.monthly_mean
--- a/namelist.clm3_casa.exp1_7.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_casa.exp1_7.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_casa/exp1_7/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip08_clm3_expa_72); CASA' biogeochemistry"
  experiment  = 'Experiment 1.7 (FACE Transient varying Climate, CO2, and N Deposition)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_cn.exp1_2.run1.monthly_mean
--- a/namelist.clm3_cn.exp1_2.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_cn.exp1_2.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_cn/exp1_2/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip05_clm3_expa_72); CN biogeochemistry"
  experiment  = 'Experiment 1.2 (Control)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_cn.exp1_3.run1.monthly_mean
--- a/namelist.clm3_cn.exp1_3.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_cn.exp1_3.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_cn/exp1_3/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip05_clm3_expa_72); CN biogeochemistry"
  experiment  = 'Experiment 1.3 (Varying Climate)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_cn.exp1_4.run1.monthly_mean
--- a/namelist.clm3_cn.exp1_4.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_cn.exp1_4.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_cn/exp1_4/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip05_clm3_expa_72); CN biogeochemistry"
  experiment  = 'Experiment 1.4 (Varying Climate, CO2, and N Deposition)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_cn.exp1_6.run1.monthly_mean
--- a/namelist.clm3_cn.exp1_6.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_cn.exp1_6.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_cn/exp1_6/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip08_clm3_expa_72); CN biogeochemistry"
  experiment  = 'Experiment 1.6 (FACE Control varying Climate, CO2, and N Deposition)'
  realization = 1
diff -r c8ca04c3a9d6 -r 2bbb71ef2f67 namelist.clm3_cn.exp1_7.run1.monthly_mean
--- a/namelist.clm3_cn.exp1_7.run1.monthly_mean	Sun Sep 21 21:59:01 2008 -0400
+++ b/namelist.clm3_cn.exp1_7.run1.monthly_mean	Tue Sep 23 12:03:47 2008 -0400
@@ -1,6 +1,6 @@
  &inparm
  output_path = '/u3/forrest/ESG/c-lamp/clm3_cn/exp1_7/run1/monthly_mean/'
- input_table = 'C-LAMP_L1_table'
+ input_table = '../c-lamp_cmor_tables/C-LAMP_L1_table'
  source      = "Community Climate System Model: CCSM3.1 (ccsm3_1_beta40); Community Land Model: CLM3 (bgcmip08_clm3_expa_72); CN biogeochemistry"
  experiment  = 'Experiment 1.7 (FACE Transient varying Climate, CO2, and N Deposition)'
  realization = 1