@@ -16,20 +16,20 @@ namespace mam4 {
1616 // with the CPU only version, somthing like this would work. Strings do not do
1717 // well on device but enums are fast.
1818
19- enum FieldNameIndex { T_mid, qv , qc , qt , nc , nr , ni , nmr , mmr, NUMFIELD };
19+ enum FieldNameIndex { T_mid, qv, qc, qi , nc, nr, ni, nmr, mmr, NUMFIELD};
2020 struct min_max {const Real min; const Real max;};
2121
2222 KOKKOS_INLINE_FUNCTION constexpr min_max physical_min_max(const FieldNameIndex ind) {
2323 const min_max field_min_max[NUMFIELD] = {
2424 {100, 500}, // T_mid
2525 {1e-13, 0.2}, // qv
2626 {0, 0.1}, // qc
27- {0, 0.1}, // qt
27+ {0, 0.1}, // qi
2828 {0, 0.1e11}, // nc
2929 {0, 0.1e10}, // nr
3030 {0, 0.1e10}, // ni
31- {100, 0. 1e13}, // nmr
32- {100, 0. 1e-5 } // mmr
31+ {100, 1e13}, // nmr
32+ {100, 1e-4 } // mmr
3333 };
3434 return field_min_max[ind];
3535 }
@@ -48,7 +48,7 @@ namespace mam4 {
4848 {"T_mid", {physical_min(T_mid), physical_max(T_mid)} },
4949 {"qv", {physical_min(qv), physical_max(qv)} },
5050 {"qc", {physical_min(qc), physical_max(qc)} },
51- {"qt ", {physical_min(qt ), physical_max(qt )} },
51+ {"qi ", {physical_min(qi ), physical_max(qi )} },
5252 {"nc", {physical_min(nc), physical_max(nc)} },
5353 {"nr", {physical_min(nr), physical_max(nr)} },
5454 {"ni", {physical_min(ni), physical_max(ni)} },
@@ -62,8 +62,8 @@ inline const std::pair<Real, Real> &
6262physical_min_max (const std::string &field_name) {
6363 static const std::map<std::string, std::pair<Real, Real>> limits = {
6464 {" T_mid" , {100 , 500 }}, {" qv" , {1e-13 , 0.2 }}, {" qc" , {0 , 0.1 }},
65- {" qt " , {0 , 0.1 }}, {" nc" , {0 , 0.1e11 }}, {" nr" , {0 , 0.1e10 }},
66- {" ni" , {0 , 0.1e10 }}, {" nmr" , {0 , 0. 1e13 }}, {" mmr" , {0 , 0. 1e-5 }}};
65+ {" qi " , {0 , 0.1 }}, {" nc" , {0 , 0.1e11 }}, {" nr" , {0 , 0.1e10 }},
66+ {" ni" , {0 , 0.1e10 }}, {" nmr" , {0 , 1e13 }}, {" mmr" , {0 , 1e-4 }}};
6767 return limits.at (field_name);
6868}
6969inline Real physical_min (const std::string &field_name) {
0 commit comments