fix sstp for var dt

Author: pdziekan

src/impl/particles_impl.ipp

@@ -167,8 +167,9 @@ namespace libcloudphxx
       // is a constant, external pressure profile used? (e.g. anelastic model)
       bool const_p;
 
-      // is it allowed to do condensation substepping, if not, some memory can be saved
-      bool allow_sstp_cond;
+      // is it allowed to do substepping, if not, some memory can be saved
+      bool allow_sstp_cond,
+           allow_sstp_chem;
 
       // timestep counter
       n_t stp_ctr;
@@ -335,6 +336,7 @@ namespace libcloudphxx
         SGS_mix_len(_opts_init.SGS_mix_len),
         adve_scheme(_opts_init.adve_scheme),
         allow_sstp_cond(_opts_init.sstp_cond > 1 || _opts_init.variable_dt_switch),
+        allow_sstp_chem(_opts_init.sstp_chem > 1 || _opts_init.variable_dt_switch),
         pure_const_multi (((_opts_init.sd_conc) == 0) && (_opts_init.sd_const_multi > 0 || _opts_init.dry_sizes.size() > 0)) // coal prob can be greater than one only in sd_conc simulations
       {
 

src/impl/particles_impl_sstp.ipp

@@ -14,7 +14,7 @@ namespace libcloudphxx
     template <typename real_t, backend_t device>
     void particles_t<real_t, device>::impl::sstp_save()
     {
-      if (opts_init.sstp_cond == 1) return;
+      if (!allow_sstp_cond) return;
 
       const int n = 4;
       thrust_device::vector<real_t>
@@ -41,7 +41,7 @@ namespace libcloudphxx
     template <typename real_t, backend_t device>
     void particles_t<real_t, device>::impl::init_sstp()
     {   
-      if (opts_init.sstp_cond == 1 || !opts_init.exact_sstp_cond) return;
+      if (!allow_sstp_cond || !opts_init.exact_sstp_cond) return;
 
       const int n = 4;
       thrust_device::vector<real_t>
@@ -62,7 +62,7 @@ namespace libcloudphxx
       const int &step
     )
     {   
-      if (opts_init.sstp_cond == 1) return;
+      if (sstp_cond == 1) return;
 
       namespace arg = thrust::placeholders;
 
@@ -73,7 +73,7 @@ namespace libcloudphxx
 
       for (int ix = 0; ix < (var_rho ? n : n-1); ++ix)
       {
-        const real_t sstp = opts_init.sstp_cond;
+        const real_t sstp = sstp_cond;
         if (step == 0)
         {
           // sstp_tmp_scl = dscl_adv (i.e. delta, i.e. new - old)
@@ -109,7 +109,7 @@ namespace libcloudphxx
       const int &step
     )
     {   
-      if (opts_init.sstp_cond == 1) return;
+      if (sstp_cond == 1) return;
 
       namespace arg = thrust::placeholders;
 
@@ -121,7 +121,7 @@ namespace libcloudphxx
 
       for (int ix = 0; ix < (const_p ? n : n-1); ++ix)
       {
-        const real_t sstp = opts_init.sstp_cond;
+        const real_t sstp = sstp_cond;
       	if (step == 0)
       	{
       	  // sstp_tmp_scl = dscl_adv (i.e. delta, i.e. new - old)

src/impl/particles_impl_sstp_chem.ipp

@@ -14,7 +14,7 @@ namespace libcloudphxx
     template <typename real_t, backend_t device>
     void particles_t<real_t, device>::impl::sstp_save_chem()
     {
-      if (opts_init.sstp_chem == 1) return;
+      if (!allow_sstp_chem) return;
 
       const int n = 6;
       thrust_device::vector<real_t>
@@ -35,7 +35,7 @@ namespace libcloudphxx
     template <typename real_t, backend_t device>
     void particles_t<real_t, device>::impl::init_sstp_chem()
     {   
-      if (opts_init.sstp_chem == 1) return;
+      if (!allow_sstp_chem) return;
 
       // memory allocation 
       sstp_tmp_chem_0.resize(n_cell);
@@ -54,7 +54,7 @@ namespace libcloudphxx
       const int &step
     )
     {   
-      if (opts_init.sstp_chem == 1) return;
+      if (!allow_sstp_chem) return;
 
       namespace arg = thrust::placeholders;
 
@@ -68,7 +68,7 @@ namespace libcloudphxx
 
       for (int ix = 0; ix < (var_rho ? n : n-1); ++ix)
       {
-        const real_t sstp = opts_init.sstp_chem;
+        const real_t sstp = sstp_chem;
 	if (step == 0)
 	{
 	  // sstp_tmp_scl = dscl_adv (i.e. delta, i.e. new - old)