rename ice_mass to ice_mix_ratio

Author: AgnieszkaMakulska

bindings/python/lib.cpp

@@ -418,7 +418,7 @@ BOOST_PYTHON_MODULE(libcloudphxx)
       .def("diag_water_cons",    &lgr::particles_proto_t<real_t>::diag_water_cons)
       .def("diag_ice_a_mom",    &lgr::particles_proto_t<real_t>::diag_ice_a_mom)
       .def("diag_ice_c_mom",    &lgr::particles_proto_t<real_t>::diag_ice_c_mom)
-      .def("diag_ice_mass",    &lgr::particles_proto_t<real_t>::diag_ice_mass)
+      .def("diag_ice_mix_ratio",    &lgr::particles_proto_t<real_t>::diag_ice_mix_ratio)
       .def("outbuf",       &lgrngn::outbuf<real_t>)
       .def("get_attr",    &lgr::particles_proto_t<real_t>::get_attr)
     ;

include/libcloudph++/lgrngn/particles.hpp

@@ -108,7 +108,7 @@ namespace libcloudphxx
       virtual void diag_wet_mom(const int&)                                     { assert(false); }
       virtual void diag_ice_a_mom(const int&)                                   { assert(false); }
       virtual void diag_ice_c_mom(const int&)                                   { assert(false); }
-      virtual void diag_ice_mass()                                               { assert(false); }
+      virtual void diag_ice_mix_ratio()                                         { assert(false); }
       virtual void diag_wet_mass_dens(const real_t&, const real_t&)             { assert(false); }
       virtual void diag_chem(const enum common::chem::chem_species_t&)          { assert(false); }
       virtual void diag_precip_rate()                                           { assert(false); }
@@ -206,7 +206,7 @@ namespace libcloudphxx
       void diag_wet_mom(const int &k);
       void diag_ice_a_mom(const int &k);
       void diag_ice_c_mom(const int &k);
-      void diag_ice_mass();
+      void diag_ice_mix_ratio();
       void diag_kappa_mom(const int &k);
       void diag_up_mom(const int&);
       void diag_vp_mom(const int&);
@@ -315,7 +315,7 @@ namespace libcloudphxx
       void diag_wet_mom(const int &k);
       void diag_ice_a_mom(const int &k);
       void diag_ice_c_mom(const int &k);
-      void diag_ice_mass();
+      void diag_ice_mix_ratio();
       void diag_kappa_mom(const int&);
       void diag_up_mom(const int&);
       void diag_vp_mom(const int&);

src/particles_diag.ipp

@@ -422,9 +422,9 @@ namespace libcloudphxx
       pimpl->moms_calc(pimpl->ice_c.begin(), n);
     }
 
-     // computes ice volume
+     // computes ice mixing ratio
     template <typename real_t, backend_t device>
-      void particles_t<real_t, device>::diag_ice_mass()
+      void particles_t<real_t, device>::diag_ice_mix_ratio()
      {
       pimpl->moms_calc(thrust::make_transform_iterator(
         thrust::make_zip_iterator(thrust::make_tuple(pimpl->ice_a.begin(), pimpl->ice_c.begin(), pimpl->ice_rho.begin())),

tests/python/unit/ice_SD.py

@@ -53,7 +53,7 @@ def lognormal(lnr):
         prtcls.step_sync(opts, th, rv, rhod)
         prtcls.step_async(opts)
     prtcls.diag_all()
-    prtcls.diag_ice_mass()
+    prtcls.diag_ice_mix_ratio()
     ri = np.frombuffer(prtcls.outbuf())
     print("ice mixing ratio ", ri[0] * 1e3, "g/kg")
     print("water vapor mixing ratio ", rv[0] * 1e3, "g/kg")