Clang format.

Author: overfelt

src/mam4xx/mam4.hpp

@@ -36,12 +36,12 @@
 #include <mam4xx/ndrop.hpp>
 #include <mam4xx/nucleate_ice.hpp>
 #include <mam4xx/nucleation.hpp>
+#include <mam4xx/physical_limits.hpp>
 #include <mam4xx/rename.hpp>
 #include <mam4xx/spitfire_transport.hpp>
 #include <mam4xx/tropopause.hpp>
 #include <mam4xx/water_uptake.hpp>
 #include <mam4xx/wet_dep.hpp>
-#include <mam4xx/physical_limits.hpp>
 
 namespace mam4 {
 

src/mam4xx/physical_limits.hpp

@@ -5,34 +5,73 @@
 
 #ifndef PHYSICAL_LIMITS_HPP
 #define PHYSICAL_LIMITS_HPP
-#include <utility>
-#include <string>
 #include <map>
+#include <string>
+#include <utility>
 
 namespace mam4 {
 
+#if 0
+  // If a device callable version of physical_min and physical_max is needed along
+  // with the CPU only version, somthing like this would work. Strings do not do
+  // well on device but enums are fast.
+  
+  enum FieldNameIndex { T_mid, qv , qc , qt , nc , nr , ni , nmr , mmr, NUMFIELD };
+  struct min_max {const Real min; const Real max;};
+
+  KOKKOS_INLINE_FUNCTION constexpr min_max physical_min_max(const FieldNameIndex ind) {
+    const min_max field_min_max[NUMFIELD] = {
+      {100, 500},         // T_mid
+      {1e-13, 0.2},       // qv 
+      {0, 0.1},           // qc 
+      {0, 0.1},           // qt 
+      {0, 0.1e11},        // nc 
+      {0, 0.1e10},        // nr 
+      {0, 0.1e10},        // ni 
+      {100, 0.1e13},      // nmr 
+      {100, 0.1e-5}       // mmr
+    };
+    return field_min_max[ind];
+  }
+
+  KOKKOS_INLINE_FUNCTION constexpr Real physical_min(const FieldNameIndex ind) {
+    return physical_min_max(ind).min;
+  }
+
+  KOKKOS_INLINE_FUNCTION constexpr Real physical_max(const FieldNameIndex ind) {
+    return physical_min_max(ind).max;
+  }
+
   inline const std::pair<Real,Real>&  physical_min_max(const std::string &field_name) {
     static const std::map<std::string, std::pair<Real,Real>> 
       limits = {
-        {"T_min", {100, 500} },
-        {"qv", {1e-13, 0.2} },
-        {"qc", {0, 0.1} },
-        {"qt", {0, 0.1} },
-        {"nc", {0, 0.1e11} },
-        {"nr", {0, 0.1e10} },
-        {"ni", {0, 0.1e10} },
-        {"nmr", {0, 0.1e13} },
-        {"mmr", {0, 0.1e-5} }
+        {"T_mid", {physical_min(T_mid), physical_max(T_mid)} },
+        {"qv",    {physical_min(qv), physical_max(qv)} },
+        {"qc",    {physical_min(qc), physical_max(qc)} },
+        {"qt",    {physical_min(qt), physical_max(qt)} },
+        {"nc",    {physical_min(nc), physical_max(nc)} },
+        {"nr",    {physical_min(nr), physical_max(nr)} },
+        {"ni",    {physical_min(ni), physical_max(ni)} },
+        {"nmr",   {physical_min(nmr), physical_max(nmr)} },
+        {"mmr",   {physical_min(mmr), physical_max(mmr)} }
       };
     return limits.at(field_name);
   }
-
-  inline Real physical_min(const std::string &field_name) {
-    return physical_min_max(field_name).first;
-  }
-  inline Real physical_max(const std::string &field_name) {
-    return physical_min_max(field_name).second;
-  }
+#endif
+inline const std::pair<Real, Real> &
+physical_min_max(const std::string &field_name) {
+  static const std::map<std::string, std::pair<Real, Real>> limits = {
+      {"T_mid", {100, 500}}, {"qv", {1e-13, 0.2}}, {"qc", {0, 0.1}},
+      {"qt", {0, 0.1}},      {"nc", {0, 0.1e11}},  {"nr", {0, 0.1e10}},
+      {"ni", {0, 0.1e10}},   {"nmr", {0, 0.1e13}}, {"mmr", {0, 0.1e-5}}};
+  return limits.at(field_name);
+}
+inline Real physical_min(const std::string &field_name) {
+  return physical_min_max(field_name).first;
+}
+inline Real physical_max(const std::string &field_name) {
+  return physical_min_max(field_name).second;
+}
 } // namespace mam4
 
 #endif