Pi chamber mixed

include/UWLCM/output_bins.hpp

@@ -5,6 +5,8 @@
 
 namespace
 {
+  // return values are actually left efges of bins
+
   // bin sizes for calc and plot
   std::vector<quantity<si::length, setup::real_t> > bins_dry()
   {
@@ -20,8 +22,13 @@ namespace
     std::vector<quantity<si::length, setup::real_t> > ret;
 
     // wet radius bins: .001 ... .01 ... 1 mm (30 bins in total)
-    for (int i = 0; i < 30; ++i)
-      ret.push_back(setup::real_t(1e-6 * pow(10, -3 + i * .2)) * si::metres);
+    //for (int i = 0; i < 30; ++i)
+    //  ret.push_back(setup::real_t(1e-6 * pow(10, -3 + i * .2)) * si::metres);
+
+    // wet radius bins: from 0 um to 50 um, bin width of 0.2um
+    for (int i = 0; i < 251; ++i)
+      ret.push_back(setup::real_t(0 + i * 0.2e-6) * si::metres);
+
     return ret;
   }
 };

src/cases/Anelastic.hpp

@@ -27,7 +27,7 @@ namespace cases
       using libcloudphxx::common::moist_air::R_d_over_c_pd;
       using libcloudphxx::common::moist_air::c_pd;
       using libcloudphxx::common::moist_air::R_d;
-      using libcloudphxx::common::const_cp::l_tri;
+      using libcloudphxx::common::const_cp::ls_tri;
       using libcloudphxx::common::theta_std::p_1000;
 
       assert(p_0 > 0. * si::pascals);
@@ -47,9 +47,9 @@ namespace cases
       real_t rv = 461; // specific gas constant for vapor
       real_t ee0 = 611.;
       real_t a = R_d<real_t>() / rv / si::joules * si::kelvins * si::kilograms; // aka epsilon
-      real_t b = l_tri<real_t>() / si::joules * si::kilograms / rv / tt0;
-      real_t c = l_tri<real_t>() / c_pd<real_t>() / si::kelvins;
-      real_t d = l_tri<real_t>() / si::joules * si::kilograms / rv;
+      real_t b = ls_tri<real_t>() / si::joules * si::kilograms / rv / tt0;
+      real_t c = ls_tri<real_t>() / c_pd<real_t>() / si::kelvins;
+      real_t d = ls_tri<real_t>() / si::joules * si::kilograms / rv;
       real_t f = R_d_over_c_pd<real_t>(); 
 
       real_t lwp_env = 0;
@@ -66,7 +66,7 @@ namespace cases
         real_t qvs = a * ees / (profs.p_e(k) - ees);  // saturation vapor mixing ratio = R_d / R_v * ees / p_d
         // calculate linearized condensation rate
         real_t cf1 = thetme*thetme*thi*thi;  // T^{-2}
-        cf1 *= c * d * profs.p_e(k) / (profs.p_e(k) - ees); // = l_tri^2 / (C_pd * R_v * T^2) * p/p_d
+        cf1 *= c * d * profs.p_e(k) / (profs.p_e(k) - ees); // = ls_tri^2 / (C_pd * R_v * T^2) * p/p_d
         real_t delta = (r_t(k*dz) - qvs) / (1 + qvs * cf1); // how much supersaturated is the air (divided by sth)
         if(delta < 0.) delta = 0.;
         profs.rv_e(k) = r_t(k*dz) - delta;

src/cases/CumulusCongestus.hpp

@@ -17,7 +17,7 @@ namespace cases
     using libcloudphxx::common::moist_air::c_pd;
     using libcloudphxx::common::moist_air::R_d;
     using libcloudphxx::common::moist_air::R_v;
-    using libcloudphxx::common::const_cp::l_tri;
+    using libcloudphxx::common::const_cp::ls_tri;
     using libcloudphxx::common::const_cp::p_vs;
     using libcloudphxx::common::theta_std::p_1000;
 
@@ -141,7 +141,7 @@ namespace cases
         using libcloudphxx::common::moist_air::R_d_over_c_pd;
         using libcloudphxx::common::moist_air::c_pd;
         using libcloudphxx::common::moist_air::R_d;
-        using libcloudphxx::common::const_cp::l_tri;
+        using libcloudphxx::common::const_cp::ls_tri;
         using libcloudphxx::common::theta_std::p_1000;
 
         parent_t::set_profs(profs, nz, user_params);

src/cases/DYCOMS.hpp

@@ -235,7 +235,7 @@ namespace cases
         using libcloudphxx::common::moist_air::R_d_over_c_pd;
         using libcloudphxx::common::moist_air::c_pd;
         using libcloudphxx::common::moist_air::R_d;
-        using libcloudphxx::common::const_cp::l_tri;
+        using libcloudphxx::common::const_cp::ls_tri;
         using libcloudphxx::common::theta_std::p_1000;
 
         blitz::firstIndex k;
@@ -280,7 +280,7 @@ namespace cases
         if(timestep == 0) // TODO: what if this function is not called at t=0? force such call
         {
           auto flux_value = RF == 1 ? 115. : 93.; // [W/m^2]
-          auto conv_fctr_lat = (libcloudphxx::common::const_cp::l_tri<real_t>() * si::kilograms / si::joules);
+          auto conv_fctr_lat = (libcloudphxx::common::const_cp::ls_tri<real_t>() * si::kilograms / si::joules);
           surf_flux_lat = -flux_value / conv_fctr_lat; // [kg / (m^2 * s)]
         }
       }

src/cases/MoistThermalGrabowskiClark99.hpp

@@ -27,7 +27,7 @@ namespace cases
     using libcloudphxx::common::moist_air::c_pd;
     using libcloudphxx::common::moist_air::R_d;
     using libcloudphxx::common::moist_air::R_v;
-    using libcloudphxx::common::const_cp::l_tri;
+    using libcloudphxx::common::const_cp::ls_tri;
     using libcloudphxx::common::const_cp::p_vs;
     using libcloudphxx::common::theta_std::p_1000;
 
@@ -202,7 +202,7 @@ namespace cases
         using libcloudphxx::common::moist_air::R_d_over_c_pd;
         using libcloudphxx::common::moist_air::c_pd;
         using libcloudphxx::common::moist_air::R_d;
-        using libcloudphxx::common::const_cp::l_tri;
+        using libcloudphxx::common::const_cp::ls_tri;
         using libcloudphxx::common::theta_std::p_1000;
         using setup::real_t;
 
@@ -219,9 +219,9 @@ namespace cases
         const real_t gg = 9.81;
         real_t rg = R_d<setup::real_t>() / si::joules * si::kelvins * si::kilograms;
         setup::real_t a = R_d<setup::real_t>() / rv / si::joules * si::kelvins * si::kilograms;
-    //    setup::real_t b = l_tri<setup::real_t>() / si::joules * si::kilograms / rv / tt0;
-        setup::real_t c = l_tri<setup::real_t>() / c_pd<setup::real_t>() / si::kelvins;
-        setup::real_t d = l_tri<setup::real_t>() / si::joules * si::kilograms / rv;
+    //    setup::real_t b = ls_tri<setup::real_t>() / si::joules * si::kilograms / rv / tt0;
+        setup::real_t c = ls_tri<setup::real_t>() / c_pd<setup::real_t>() / si::kelvins;
+        setup::real_t d = ls_tri<setup::real_t>() / si::joules * si::kilograms / rv;
         setup::real_t cap = R_d_over_c_pd<setup::real_t>(); 
         real_t capi = 1./cap;