Th pres opts

bindings/python/blk_1m.hpp

@@ -18,6 +18,7 @@ namespace libcloudphxx {
     namespace b1m = libcloudphxx::blk_1m;
 
     namespace blk_1m {
+/*
       template<class arr_t>
       void adj_cellwise(
         const b1m::opts_t<typename arr_t::T_numtype> &opts,
@@ -71,26 +72,32 @@ namespace libcloudphxx {
           dt
         );
       }
+      */
 
       template<class arr_t>
-      void adj_cellwise_nwtrph(
+      void adj_cellwise(
         const b1m::opts_t<typename arr_t::T_numtype> &opts,
+        const bp_array &rhod,
         const bp_array &p,
         bp_array &th,
         bp_array &rv,
         bp_array &rc,
+        bp_array &rr,
         const typename arr_t::T_numtype &dt
       ) {
         arr_t
         np2bz_th(np2bz<arr_t>(th)),
         np2bz_rv(np2bz<arr_t>(rv)),
-        np2bz_rc(np2bz<arr_t>(rc));
-        b1m::adj_cellwise_nwtrph(
+        np2bz_rc(np2bz<arr_t>(rc)),
+        np2bz_rr(np2bz<arr_t>(rr));
+        b1m::adj_cellwise(
           opts,
+          np2bz<arr_t>(rhod),
           np2bz<arr_t>(p),
           np2bz_th,
           np2bz_rv,
           np2bz_rc,
+          np2bz_rr,
           dt
         );
       }
@@ -116,7 +123,7 @@ namespace libcloudphxx {
       }
 
       template<class arr_t>
-      void rhs_cellwise_nwtrph(
+      void rhs_cellwise_revap(
         const b1m::opts_t<typename arr_t::T_numtype> &opts,
         bp_array &dot_th,
         bp_array &dot_rv,
@@ -135,7 +142,7 @@ namespace libcloudphxx {
         np2bz_dot_rr(np2bz<arr_t>(dot_rr)),
         np2bz_dot_rv(np2bz<arr_t>(dot_rv)),
         np2bz_dot_th(np2bz<arr_t>(dot_th));
-        b1m::rhs_cellwise_nwtrph(
+        b1m::rhs_cellwise_revap(
           opts,
           np2bz_dot_th,
           np2bz_dot_rv,
@@ -153,7 +160,7 @@ namespace libcloudphxx {
 
 
       template<class arr_t>
-      void rhs_cellwise_nwtrph_ice(
+      void rhs_cellwise_ice(
         const b1m::opts_t<typename arr_t::T_numtype> &opts,
         bp_array &dot_th,
         bp_array &dot_rv,
@@ -178,7 +185,7 @@ namespace libcloudphxx {
         np2bz_dot_rr(np2bz<arr_t>(dot_rr)),
         np2bz_dot_rv(np2bz<arr_t>(dot_rv)),
         np2bz_dot_th(np2bz<arr_t>(dot_th));
-        b1m::rhs_cellwise_nwtrph_ice(
+        b1m::rhs_cellwise_ice(
           opts,
           np2bz_dot_th,
           np2bz_dot_rv,

bindings/python/lib.cpp

@@ -168,13 +168,14 @@ BOOST_PYTHON_MODULE(libcloudphxx)
       .def_readwrite("r_c0", &b1m::opts_t<real_t>::r_c0)
       .def_readwrite("r_eps", &b1m::opts_t<real_t>::r_eps)
       .def_readwrite("nwtrph_iters", &b1m::opts_t<real_t>::nwtrph_iters)
+      .def_readwrite("const_p", &b1m::opts_t<real_t>::const_p)
+      .def_readwrite("th_dry", &b1m::opts_t<real_t>::th_dry)
+      .def_readwrite("adj_nwtrph", &b1m::opts_t<real_t>::adj_nwtrph)
       ;
     bp::def("adj_cellwise", blk_1m::adj_cellwise<arr_t>);
-    bp::def("adj_cellwise_constp", blk_1m::adj_cellwise_constp<arr_t>);
-    bp::def("adj_cellwise_nwtrph", blk_1m::adj_cellwise_nwtrph<arr_t>);
     bp::def("rhs_cellwise", blk_1m::rhs_cellwise<arr_t>);
-    bp::def("rhs_cellwise_nwtrph", blk_1m::rhs_cellwise_nwtrph<arr_t>);
-    bp::def("rhs_cellwise_nwtrph_ice", blk_1m::rhs_cellwise_nwtrph_ice<arr_t>);
+    bp::def("rhs_cellwise_revap", blk_1m::rhs_cellwise_revap<arr_t>);
+    bp::def("rhs_cellwise_ice", blk_1m::rhs_cellwise_ice<arr_t>);
     bp::def("rhs_columnwise", blk_1m::rhs_columnwise<arr_t>); // TODO: handle the returned flux
     bp::def("rhs_columnwise_ice", blk_1m::rhs_columnwise_ice<arr_t>);
 
@@ -197,6 +198,8 @@ BOOST_PYTHON_MODULE(libcloudphxx)
       .def_readwrite("sedi", &b2m::opts_t<real_t>::sedi)
       .def_readwrite("RH_max", &b2m::opts_t<real_t>::RH_max)
       .add_property("dry_distros", &blk_2m::get_dd<real_t>, &blk_2m::set_dd<real_t>)
+      .def_readwrite("const_p", &b2m::opts_t<real_t>::const_p)
+      .def_readwrite("th_dry", &b2m::opts_t<real_t>::th_dry)
     ;
     bp::def("rhs_cellwise", blk_2m::rhs_cellwise<arr_t>);
     bp::def("rhs_columnwise", blk_2m::rhs_columnwise<arr_t>); // TODO: handle the returned flux
@@ -344,6 +347,8 @@ BOOST_PYTHON_MODULE(libcloudphxx)
       .add_property("SGS_mix_len", &lgrngn::get_SGS_mix_len<real_t>, &lgrngn::set_SGS_mix_len<real_t>)
       .add_property("kernel_parameters", &lgrngn::get_kp<real_t>, &lgrngn::set_kp<real_t>)
       .def_readwrite("variable_dt_switch", &lgr::opts_init_t<real_t>::variable_dt_switch)
+      .def_readwrite("const_p", &lgr::opts_init_t<real_t>::const_p)
+      .def_readwrite("th_dry", &lgr::opts_init_t<real_t>::th_dry)
     ;
     bp::class_<lgr::particles_proto_t<real_t>/*, boost::noncopyable*/>("particles_proto_t")
       .add_property("opts_init", &lgrngn::get_oi<real_t>)