Cc master

include/UWLCM/output_bins.hpp

@@ -9,7 +9,7 @@ namespace
   std::vector<quantity<si::length, setup::real_t> > bins_dry()
   {
     std::vector<quantity<si::length, setup::real_t> > ret;
-    // dry radius bins: .001 ... .01 ... 10 .. 25.119 (22 bins in total)
+    // dry radius bins: .001 ... .01 ... 10 .. 25.119 micrometer (22 bins in total)
     for (int i = 0; i < 22; ++i)
       ret.push_back(setup::real_t(1e-6 * pow(10, -3 + i * .2)) * si::metres);
     return ret;
@@ -19,7 +19,7 @@ namespace
   {
     std::vector<quantity<si::length, setup::real_t> > ret;
 
-    // wet radius bins: .001 ... .01 ... 1 mm (30 bins in total)
+    // wet radius bins: 1e-6 ... .001 ... 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);
     return ret;

src/run_hlpr.cpp

@@ -14,7 +14,7 @@
 #include "cases/RICO11.hpp"
 #include "cases/MoistThermalGrabowskiClark99.hpp"
 #include "cases/DryThermalGMD2015.hpp"
-#include "cases/LasherTrapp2001.hpp"
+#include "cases/CumulusCongestus.hpp"
 
 #include "opts/opts_common.hpp"
 #include "solvers/common/calc_forces_common.hpp"
@@ -93,9 +93,9 @@ void run(const int (&nps)[n_dims], const user_params_t &user_params)
   else if (user_params.model_case == "dycoms_rf01")
     case_ptr.reset(new cases::dycoms::Dycoms<case_ct_params_t, 1, n_dims>(user_params.X, user_params.Y, user_params.Z)); 
   else if (user_params.model_case == "dycoms_rf02")
-    case_ptr.reset(new cases::dycoms::Dycoms<case_ct_params_t, 2, n_dims>(user_params.X, user_params.Y, user_params.Z)); 
-  else if (user_params.model_case == "lasher_trapp")
-    case_ptr.reset(new cases::LasherTrapp::LasherTrapp2001<case_ct_params_t, n_dims>(user_params.X, user_params.Y, user_params.Z));
+    case_ptr.reset(new cases::dycoms::Dycoms<case_ct_params_t, 2, n_dims>()); 
+  else if (user_params.model_case == "cumulus_congestus")
+    case_ptr.reset(new cases::cumuluscongestus::CumulusCongestus<case_ct_params_t, n_dims>());
   else if (user_params.model_case == "rico11")
     case_ptr.reset(new cases::rico::Rico11<case_ct_params_t, n_dims>(user_params.X, user_params.Y, user_params.Z));
   else
@@ -158,7 +158,7 @@ void run(const int (&nps)[n_dims], const user_params_t &user_params)
   {
     concurr.reset(new concurr_openmp_cyclic_t(p));
   }
-  else if(user_params.model_case == "lasher_trapp")
+  else if(user_params.model_case == "cumulus_congestus")
   {
     //concurr.reset(new concurr_openmp_rigid_gndsky_t(p));     // rigid horizontal boundaries
     concurr.reset(new concurr_openmp_cyclic_gndsky_t(p)); // cyclic horizontal boundaries, as in the ICMW2020 case

src/uwlcm.cpp

@@ -58,7 +58,7 @@ int main(int argc, char** argv)
     // note: all options should have default values here to make "--micro=? --help" work
     opts_main.add_options()
       ("micro", po::value<std::string>()->required(), "one of: blk_1m, blk_2m, lgrngn")
-      ("case", po::value<std::string>()->required(), "one of: dry_thermal, moist_thermal, dycoms, lasher_trapp")
+      ("case", po::value<std::string>()->required(), "one of: dry_thermal, moist_thermal, dycoms, cumulus_congestus")
       ("X", po::value<setup::real_t>()->default_value(-1) , "domain size in X [m] (set negative for case default)")
       ("Y", po::value<setup::real_t>()->default_value(-1) , "domain size in Y [m] (set negative for case default)")
       ("Z", po::value<setup::real_t>()->default_value(-1) , "domain size in Z [m] (set negative for case default)")

tests/unit/api_test.cpp

@@ -41,7 +41,7 @@ int main(int ac, char** av)
     "--case=dycoms_rf02 --relax_th_rv=1",
     "--case=rico11",
     "--case=dycoms_rf01",
-    "--case=lasher_trapp"
+    "--case=cumulus_congestus"
   });
   vector<string> opts_piggy({
     "--piggy=0",

tests/unit/refdata_iles/10323890074231804654/velocity_out.dat

@@ -11,8 +11,8 @@
 [ 0.000576176 -0.000801522 -0.000692223 -0.000801522 0.000576176 -0.000684045 0.000576176 -0.000801522 
   0.000421895 -0.000957842 0.00140572 -0.000957842 0.000421895 0.000931667 0.000421895 -0.000957842 
   0.000409153 -0.0015399 0 -0.000105385 -8.3918e-06 0 0.000409153 -0.0015399 
-  0.000576176 -0.000801522 0 -5.48383e-05 -1.18194e-05 0 0.000576176 -0.000801522 
-  0.000421895 -0.000957842 0 -6.55456e-05 -8.6528e-06 0 0.000421895 -0.000957842 
+  0.000576176 -0.000801522 0 -5.48383e-05 -1.18193e-05 0 0.000576176 -0.000801522 
+  0.000421895 -0.000957842 0 -6.55457e-05 -8.6528e-06 0 0.000421895 -0.000957842 
   0.000409153 -0.0015399 0 -0.000105385 -8.3918e-06 0 0.000409153 -0.0015399 
   0.000576176 -0.000801522 -0.000692223 -0.000801522 0.000576176 -0.000684045 0.000576176 -0.000801522 
   0.000421895 -0.000957842 0.00140572 -0.000957842 0.000421895 0.000931667 0.000421895 -0.000957842 ]
@@ -28,9 +28,9 @@
 (-2,5) x (-2,5)
 [ -0.000599707 0.000693725 0.000695749 0.000693725 -0.000599707 0.000689608 -0.000599707 0.000693725 
   -0.000439779 0.000824963 -0.00140285 0.000824963 -0.000439779 -0.000931557 -0.000439779 0.000824963 
-  -0.000425464 0.00132904 0 -0.000334842 -8.03836e-05 0 -0.000425464 0.00132904 
-  -0.000599707 0.000693725 0 0.000408977 0.000110347 0 -0.000599707 0.000693725 
-  -0.000439779 0.000824963 0 0.000254369 -6.46894e-05 0 -0.000439779 0.000824963 
-  -0.000425464 0.00132904 0 -0.000334842 -8.03836e-05 0 -0.000425464 0.00132904 
+  -0.000425464 0.00132904 0 -0.000334845 -8.0452e-05 0 -0.000425464 0.00132904 
+  -0.000599707 0.000693725 0 0.000408976 0.000110288 0 -0.000599707 0.000693725 
+  -0.000439779 0.000824963 0 0.000254368 -6.45593e-05 0 -0.000439779 0.000824963 
+  -0.000425464 0.00132904 0 -0.000334845 -8.0452e-05 0 -0.000425464 0.00132904 
   -0.000599707 0.000693725 0.000695749 0.000693725 -0.000599707 0.000689608 -0.000599707 0.000693725 
   -0.000439779 0.000824963 -0.00140285 0.000824963 -0.000439779 -0.000931557 -0.000439779 0.000824963 ]