make real_t typedefs public

mwarusz · mwarusz · commit b79e7f3053e6 · 2019-03-13T15:35:45.000+01:00
diff --git a/libmpdata++/solvers/detail/mpdata_rhs_vip_common.hpp b/libmpdata++/solvers/detail/mpdata_rhs_vip_common.hpp
@@ -43,9 +43,10 @@ namespace libmpdataxx
       template <class ct_params_t, int minhalo> 
       class mpdata_rhs_vip_common : public mpdata_rhs<ct_params_vip_default_t<ct_params_t>, minhalo>
       {
+        using parent_t = mpdata_rhs<ct_params_vip_default_t<ct_params_t>, minhalo>;
+
         public:
         using ix = typename ct_params_t::ix;
-        using parent_t = mpdata_rhs<ct_params_vip_default_t<ct_params_t>, minhalo>;
         using real_t = typename ct_params_t::real_t;
 
 	protected:
diff --git a/libmpdata++/solvers/detail/mpdata_rhs_vip_prs_sgs_common.hpp b/libmpdata++/solvers/detail/mpdata_rhs_vip_prs_sgs_common.hpp
@@ -36,6 +36,9 @@ namespace libmpdataxx
       class mpdata_rhs_vip_prs_sgs_common : public mpdata_rhs_vip_prs<ct_params_t, minhalo>
       {
         using parent_t = mpdata_rhs_vip_prs<ct_params_t, minhalo>;
+
+        public:
+
         using real_t = typename ct_params_t::real_t;
 
         protected:
diff --git a/libmpdata++/solvers/detail/mpdata_rhs_vip_prs_sgs_smg.hpp b/libmpdata++/solvers/detail/mpdata_rhs_vip_prs_sgs_smg.hpp
@@ -18,6 +18,9 @@ namespace libmpdataxx
       class mpdata_rhs_vip_prs_sgs_smg : public detail::mpdata_rhs_vip_prs_sgs_common<ct_params_t, minhalo>
       {
 	using parent_t = detail::mpdata_rhs_vip_prs_sgs_common<ct_params_t, minhalo>;
+
+        public:
+
         using real_t = typename ct_params_t::real_t;
 
         protected:
diff --git a/libmpdata++/solvers/detail/solver_1d.hpp b/libmpdata++/solvers/detail/solver_1d.hpp
@@ -25,6 +25,10 @@ namespace libmpdataxx
       {
 	using parent_t = solver_common<ct_params_t, n_tlev, minhalo>;
 
+        public:
+
+	using real_t = typename ct_params_t::real_t;
+
 	protected:
 
 	const rng_t i; //TODO: to be removed
@@ -65,21 +69,21 @@ namespace libmpdataxx
           this->mem->barrier();
         }
 
-        typename parent_t::real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final
+        real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final
         {
-          stat_field(this->ijk) = typename parent_t::real_t(0.5) * (abs(arrvec[0](i+h) + arrvec[0](i-h)));
+          stat_field(this->ijk) = real_t(0.5) * (abs(arrvec[0](i+h) + arrvec[0](i-h)));
           return this->mem->max(this->rank, stat_field(this->ijk));
         }
         
-        typename parent_t::real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final
+        real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final
         {
           stat_field(this->ijk) = abs((arrvec[0](i+h) - arrvec[0](i-h)));
           return this->mem->max(this->rank, stat_field(this->ijk));
         }
 
-        void scale_gc(const typename parent_t::real_t time,
-                      const typename parent_t::real_t cur_dt,
-                      const typename parent_t::real_t old_dt) final
+        void scale_gc(const real_t time,
+                      const real_t cur_dt,
+                      const real_t old_dt) final
         {
           this->mem->GC[0](rng_t(i.first(), i.last()-1)^h) *= cur_dt / old_dt;
           this->xchng_vctr_alng(this->mem->GC);
@@ -99,7 +103,7 @@ namespace libmpdataxx
 
         struct rt_params_t : parent_t::rt_params_t
         {
-          typename parent_t::real_t di = 0;
+          real_t di = 0;
         };
 
         protected:
diff --git a/libmpdata++/solvers/detail/solver_2d.hpp b/libmpdata++/solvers/detail/solver_2d.hpp
@@ -26,6 +26,10 @@ namespace libmpdataxx
       {
 	using parent_t = solver_common<ct_params_t, n_tlev, minhalo>;
 
+        public:
+
+	using real_t = typename ct_params_t::real_t;
+
 	protected:
       
 	const rng_t i, j; // TODO: to be removed
@@ -191,23 +195,23 @@ namespace libmpdataxx
           // TODO: same in 1D
           if (!opts::isset(ct_params_t::opts, opts::dfl))
           {
-            typename ct_params_t::real_t max_abs_div = max_abs_vctr_div(this->mem->GC);
+            real_t max_abs_div = max_abs_vctr_div(this->mem->GC);
 
 	    if (max_abs_div > this->max_abs_div_eps) 
 	      throw std::runtime_error("initial advector field is divergent");
           }
         }
 
-        typename parent_t::real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final
+        real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final
         {
-          stat_field(this->ijk) = typename parent_t::real_t(0.5) * (
+          stat_field(this->ijk) = real_t(0.5) * (
                                            abs(arrvec[0](i+h, j) + arrvec[0](i-h, j))
                                          + abs(arrvec[1](i, j+h) + arrvec[1](i, j-h))
                                         ) / formulae::G<ct_params_t::opts, 0>(*this->mem->G, i, j);
           return this->mem->max(this->rank, stat_field(this->ijk));
         }
         
-        typename parent_t::real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final
+        real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final
         {
           stat_field(this->ijk) = abs(
                                         (arrvec[0](i+h, j) - arrvec[0](i-h, j))
@@ -216,9 +220,9 @@ namespace libmpdataxx
           return this->mem->max(this->rank, stat_field(this->ijk));
         }
         
-        void scale_gc(const typename parent_t::real_t time,
-                      const typename parent_t::real_t cur_dt,
-                      const typename parent_t::real_t old_dt) final
+        void scale_gc(const real_t time,
+                      const real_t cur_dt,
+                      const real_t old_dt) final
         {
           this->mem->GC[0](rng_t(i.first(), i.last()-1)^h, j) *= cur_dt / old_dt;
           this->mem->GC[1](i, rng_t(j.first(), j.last()-1)^h) *= cur_dt / old_dt;
@@ -241,7 +245,7 @@ namespace libmpdataxx
         
         struct rt_params_t : parent_t::rt_params_t
         {
-          typename parent_t::real_t di = 0, dj = 0;
+          real_t di = 0, dj = 0;
         };
 
         protected:
diff --git a/libmpdata++/solvers/detail/solver_3d.hpp b/libmpdata++/solvers/detail/solver_3d.hpp
@@ -26,6 +26,10 @@ namespace libmpdataxx
       {
 	using parent_t = solver_common<ct_params_t, n_tlev, minhalo>;
 
+        public:
+
+	using real_t = typename ct_params_t::real_t;
+
 	protected:
 
 	const rng_t i, j, k; // TODO: we have ijk in solver_common - could it be removed?
@@ -232,24 +236,24 @@ namespace libmpdataxx
           // TODO: same in 1D
           if (!opts::isset(ct_params_t::opts, opts::dfl))
           {
-            typename ct_params_t::real_t max_abs_div = max_abs_vctr_div(this->mem->GC);
+            real_t max_abs_div = max_abs_vctr_div(this->mem->GC);
 
 	    if (max_abs_div > this->max_abs_div_eps) 
 	      throw std::runtime_error("initial advector field is divergent");
           }
         }
 
-        typename parent_t::real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final
+        real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final
         {
-          stat_field(this->ijk) =  typename parent_t::real_t(0.5) * (
+          stat_field(this->ijk) = real_t(0.5) * (
                                             abs(arrvec[0](i+h, j, k) + arrvec[0](i-h, j, k))
                                           + abs(arrvec[1](i, j+h, k) + arrvec[1](i, j-h, k))
                                           + abs(arrvec[2](i, j, k+h) + arrvec[2](i, j, k-h))
                                          ) / formulae::G<ct_params_t::opts, 0>(*this->mem->G, i, j, k);
           return this->mem->max(this->rank, stat_field(this->ijk));
         }
         
-        typename parent_t::real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final
+        real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final
         {
           stat_field(this->ijk) =  abs(
                                          (arrvec[0](i+h, j, k) - arrvec[0](i-h, j, k))
@@ -260,9 +264,9 @@ namespace libmpdataxx
           return this->mem->max(this->rank, stat_field(this->ijk));
         }
 
-        void scale_gc(const typename parent_t::real_t time,
-                      const typename parent_t::real_t cur_dt,
-                      const typename parent_t::real_t old_dt) final
+        void scale_gc(const real_t time,
+                      const real_t cur_dt,
+                      const real_t old_dt) final
         {
           this->mem->GC[0](rng_t(i.first(), i.last()-1)^h, j, k) *= cur_dt / old_dt;
           this->mem->GC[1](i, rng_t(j.first(), j.last()-1)^h, k) *= cur_dt / old_dt;
@@ -289,7 +293,7 @@ namespace libmpdataxx
 
         struct rt_params_t : parent_t::rt_params_t
         {
-          typename parent_t::real_t di = 0, dj = 0, dk = 0;
+          real_t di = 0, dj = 0, dk = 0;
         };
 
         protected:
diff --git a/libmpdata++/solvers/detail/solver_common.hpp b/libmpdata++/solvers/detail/solver_common.hpp
@@ -40,7 +40,7 @@ namespace libmpdataxx
         enum { n_tlev = n_tlev_ };
         
         using ct_params_t_ = ct_params_t; // propagate ct_params_t mainly for output purposes
-        typedef typename ct_params_t::real_t real_t;
+        using real_t = typename ct_params_t::real_t;
         typedef blitz::Array<real_t, n_dims> arr_t;
         using bcp_t = std::unique_ptr<bcond::detail::bcond_common<real_t, halo>>;
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,9 @@ namespace libmpdataxx`
`36`	`36`	`class mpdata_rhs_vip_prs_sgs_common : public mpdata_rhs_vip_prs<ct_params_t, minhalo>`
`37`	`37`	`{`
`38`	`38`	`using parent_t = mpdata_rhs_vip_prs<ct_params_t, minhalo>;`
	`39`	`+`
	`40`	`+ public:`
	`41`	`+`
`39`	`42`	`using real_t = typename ct_params_t::real_t;`
`40`	`43`
`41`	`44`	`protected:`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ namespace libmpdataxx`
`18`	`18`	`class mpdata_rhs_vip_prs_sgs_smg : public detail::mpdata_rhs_vip_prs_sgs_common<ct_params_t, minhalo>`
`19`	`19`	`{`
`20`	`20`	`using parent_t = detail::mpdata_rhs_vip_prs_sgs_common<ct_params_t, minhalo>;`
	`21`	`+`
	`22`	`+ public:`
	`23`	`+`
`21`	`24`	`using real_t = typename ct_params_t::real_t;`
`22`	`25`
`23`	`26`	`protected:`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@ namespace libmpdataxx`
`25`	`25`	`{`
`26`	`26`	`using parent_t = solver_common<ct_params_t, n_tlev, minhalo>;`
`27`	`27`
	`28`	`+ public:`
	`29`	`+`
	`30`	`+ using real_t = typename ct_params_t::real_t;`
	`31`	`+`
`28`	`32`	`protected:`
`29`	`33`
`30`	`34`	`const rng_t i; //TODO: to be removed`
`@@ -65,21 +69,21 @@ namespace libmpdataxx`
`65`	`69`	`this->mem->barrier();`
`66`	`70`	`}`
`67`	`71`
`68`		`- typename parent_t::real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
	`72`	`+ real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
`69`	`73`	`{`
`70`		`- stat_field(this->ijk) = typename parent_t::real_t(0.5) * (abs(arrvec[0](i+h) + arrvec[0](i-h)));`
	`74`	`+ stat_field(this->ijk) = real_t(0.5) * (abs(arrvec[0](i+h) + arrvec[0](i-h)));`
`71`	`75`	`return this->mem->max(this->rank, stat_field(this->ijk));`
`72`	`76`	`}`
`73`	`77`
`74`		`- typename parent_t::real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
	`78`	`+ real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
`75`	`79`	`{`
`76`	`80`	`stat_field(this->ijk) = abs((arrvec[0](i+h) - arrvec[0](i-h)));`
`77`	`81`	`return this->mem->max(this->rank, stat_field(this->ijk));`
`78`	`82`	`}`
`79`	`83`
`80`		`- void scale_gc(const typename parent_t::real_t time,`
`81`		`- const typename parent_t::real_t cur_dt,`
`82`		`- const typename parent_t::real_t old_dt) final`
	`84`	`+ void scale_gc(const real_t time,`
	`85`	`+ const real_t cur_dt,`
	`86`	`+ const real_t old_dt) final`
`83`	`87`	`{`
`84`	`88`	`this->mem->GC[0](rng_t(i.first(), i.last()-1)^h) *= cur_dt / old_dt;`
`85`	`89`	`this->xchng_vctr_alng(this->mem->GC);`
`@@ -99,7 +103,7 @@ namespace libmpdataxx`
`99`	`103`
`100`	`104`	`struct rt_params_t : parent_t::rt_params_t`
`101`	`105`	`{`
`102`		`- typename parent_t::real_t di = 0;`
	`106`	`+ real_t di = 0;`
`103`	`107`	`};`
`104`	`108`
`105`	`109`	`protected:`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,10 @@ namespace libmpdataxx`
`26`	`26`	`{`
`27`	`27`	`using parent_t = solver_common<ct_params_t, n_tlev, minhalo>;`
`28`	`28`
	`29`	`+ public:`
	`30`	`+`
	`31`	`+ using real_t = typename ct_params_t::real_t;`
	`32`	`+`
`29`	`33`	`protected:`
`30`	`34`
`31`	`35`	`const rng_t i, j; // TODO: to be removed`
`@@ -191,23 +195,23 @@ namespace libmpdataxx`
`191`	`195`	`// TODO: same in 1D`
`192`	`196`	`if (!opts::isset(ct_params_t::opts, opts::dfl))`
`193`	`197`	`{`
`194`		`- typename ct_params_t::real_t max_abs_div = max_abs_vctr_div(this->mem->GC);`
	`198`	`+ real_t max_abs_div = max_abs_vctr_div(this->mem->GC);`
`195`	`199`
`196`	`200`	`if (max_abs_div > this->max_abs_div_eps)`
`197`	`201`	`throw std::runtime_error("initial advector field is divergent");`
`198`	`202`	`}`
`199`	`203`	`}`
`200`	`204`
`201`		`- typename parent_t::real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
	`205`	`+ real_t courant_number(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
`202`	`206`	`{`
`203`		`- stat_field(this->ijk) = typename parent_t::real_t(0.5) * (`
	`207`	`+ stat_field(this->ijk) = real_t(0.5) * (`
`204`	`208`	`abs(arrvec[0](i+h, j) + arrvec[0](i-h, j))`
`205`	`209`	`+ abs(arrvec[1](i, j+h) + arrvec[1](i, j-h))`
`206`	`210`	`) / formulae::G<ct_params_t::opts, 0>(*this->mem->G, i, j);`
`207`	`211`	`return this->mem->max(this->rank, stat_field(this->ijk));`
`208`	`212`	`}`
`209`	`213`
`210`		`- typename parent_t::real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
	`214`	`+ real_t max_abs_vctr_div(const arrvec_t<typename parent_t::arr_t> &arrvec) final`
`211`	`215`	`{`
`212`	`216`	`stat_field(this->ijk) = abs(`
`213`	`217`	`(arrvec[0](i+h, j) - arrvec[0](i-h, j))`
`@@ -216,9 +220,9 @@ namespace libmpdataxx`
`216`	`220`	`return this->mem->max(this->rank, stat_field(this->ijk));`
`217`	`221`	`}`
`218`	`222`
`219`		`- void scale_gc(const typename parent_t::real_t time,`
`220`		`- const typename parent_t::real_t cur_dt,`
`221`		`- const typename parent_t::real_t old_dt) final`
	`223`	`+ void scale_gc(const real_t time,`
	`224`	`+ const real_t cur_dt,`
	`225`	`+ const real_t old_dt) final`
`222`	`226`	`{`
`223`	`227`	`this->mem->GC[0](rng_t(i.first(), i.last()-1)^h, j) *= cur_dt / old_dt;`
`224`	`228`	`this->mem->GC[1](i, rng_t(j.first(), j.last()-1)^h) *= cur_dt / old_dt;`
`@@ -241,7 +245,7 @@ namespace libmpdataxx`
`241`	`245`
`242`	`246`	`struct rt_params_t : parent_t::rt_params_t`
`243`	`247`	`{`
`244`		`- typename parent_t::real_t di = 0, dj = 0;`
	`248`	`+ real_t di = 0, dj = 0;`
`245`	`249`	`};`
`246`	`250`
`247`	`251`	`protected:`