Merge pull request igfuw#174 from pdziekan/out_spec_freq

Out spec freq

src/opts/opts_lgrngn.hpp

@@ -82,6 +82,7 @@ void setopts_micro(
     ("rd_min", po::value<setup::real_t>()->default_value(rt_params.cloudph_opts_init.rd_min), "minimum dry radius of initialized droplets [m] (negative means automatic detection)")
     ("rd_max", po::value<setup::real_t>()->default_value(rt_params.cloudph_opts_init.rd_max), "maximum dry radius of initialized droplets [m] (negative means automatic detection); sd_conc_large_tail==true may result in initialization of even larger droplets")
     ("relax_ccn", po::value<bool>()->default_value(false) , "add CCN if per-level mean of CCN concentration is lower than (case-specific) desired concentration")
+    ("outfreq_spec", po::value<int>()->default_value(0), "frequency (in timesteps) of spectrum output; 0 for outfreq_spec=outfreq")
     // TODO: MAC, HAC, vent_coef
   ;
   po::variables_map vm;
@@ -95,6 +96,9 @@ void setopts_micro(
 
   rt_params.async = vm["async"].as<bool>();
   rt_params.gccn = vm["gccn"].as<setup::real_t>();
+  rt_params.outfreq_spec = vm["outfreq_spec"].as<int>();
+  if(rt_params.outfreq_spec == 0) rt_params.outfreq_spec = user_params.outfreq;
+  assert((rt_params.outfreq_spec % user_params.outfreq == 0) && "outfreq_spec needs to be a multiple of outfreq");
 //  bool unit_test = vm["unit_test"].as<bool>();
   setup::real_t ReL = vm["ReL"].as<setup::real_t>();
 

src/solvers/lgrngn/diag_lgrngn.hpp

@@ -189,6 +189,7 @@ void slvr_lgrngn<ct_params_t>::diag()
 //  this->record_aux("bigrain_gccn_rw_mom0", prtcls->outbuf());
 
   // recording requested statistical moments
+  if ((this->timestep ) % static_cast<int>(params.outfreq_spec) == 0)
   {
     // dry
     int rng_num = 0;
@@ -203,10 +204,9 @@ void slvr_lgrngn<ct_params_t>::diag()
       }
       rng_num++;
     }
-  }
-  {
+
     // wet
-    int rng_num = 0;
+    rng_num = 0;
     for (auto &rng_moms : params.out_wet)
     {
       auto &rng(rng_moms.first);

src/solvers/lgrngn/hook_ante_loop_lgrngn.hpp

@@ -196,6 +196,7 @@ void slvr_lgrngn<ct_params_t>::hook_ante_loop(int nt)
     this->record_aux_const("rd_min", "lgrngn", params.cloudph_opts_init.rd_min);  
     this->record_aux_const("rd_max", "lgrngn", params.cloudph_opts_init.rd_max);  
     this->record_aux_const("relax_ccn", "user_params", params.user_params.relax_ccn);  
+    this->record_aux_const("outfreq_spec", "lgrngn", params.outfreq_spec);
   }
   this->mem->barrier();
 }

src/solvers/slvr_lgrngn.hpp

@@ -177,6 +177,7 @@ class slvr_lgrngn : public std::conditional_t<ct_params_t::sgs_scheme == libmpda
     outmom_t<real_t> out_dry, out_wet;
     bool flag_coal; // do we want coal after spinup
     real_t gccn; // multiplicity of gccn
+    int outfreq_spec;
   };
 
   private:

tests/moist_thermal/refdata/stats_lgrngn_ens_1000.txt

@@ -55,7 +55,7 @@ lgrngn
 (0,10)
 [ 2.00577e-18 0.00232077 0.00375493 0.00424003 0.00479011 0.00692947 0.0100661 0.0170639 0.0236114 0.0346478 0.0569673 ]
 (0,10)
-[ 0.000148427 0.504256 0.438996 0.393824 0.350153 0.282783 0.226725 0.18533 0.213148 0.239273 0.278241 ]
+[ 0.000148427 0.504256 0.438996 0.388295 0.350153 0.282783 0.226725 0.18533 0.213148 0.239273 0.278241 ]
 (0,10)
 [ 0.000149421 0.518692 0.465088 0.420767 0.380097 0.323393 0.292459 0.299863 0.346371 0.457317 0.678049 ]
 sdconc_avg

tests/unit/api_test.cpp

@@ -41,7 +41,7 @@ int main(int ac, char** av)
     "--case=dry_pbl",
     "--case=moist_thermal",
     "--case=dycoms_rf02",
-    "--case=dycoms_rf02 --out_dry_spec=1 --out_wet_spec=1",
+    "--case=dycoms_rf02 --out_dry_spec=1 --out_wet_spec=1 --outfreq_spec=1000",
     "--case=dycoms_rf02 --relax_th_rv=1",
     "--case=dycoms_rf02 --window=1",
     "--case=rico11",