Skip to content

Commit 912f3a1

Browse files
committed
cleanup
1 parent 5292730 commit 912f3a1

File tree

1 file changed

+26
-32
lines changed

1 file changed

+26
-32
lines changed

src/mam4xx/mo_sethet.hpp

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,14 @@ void gas_washout(
114114
// calculate gas washout by cloud if not saturated
115115
//------------------------------------------------------------------------
116116
// FIXME: BAD CONSTANTS
117-
Real allca = 0.0; // total of ca between level plev and kk [#/cm3]
118-
Real const0 = boltz_cgs * 1.0e-6; // [atmospheres/deg k/cm^3]
119-
Real geo_fac = 6.0; // geometry factor (surf area/volume = geo_fac/diameter)
120-
Real xrm = .189; // mean diameter of rain drop [cm]
121-
Real xum = 748.0; // mean rain drop terminal velocity [cm/s]
122-
Real xeqca = 0.0;
123-
Real xca = 0.0;
117+
constexpr Real allca = 0.0; // total of ca between level plev and kk [#/cm3]
118+
constexpr Real const0 = boltz_cgs * 1.0e-6; // [atmospheres/deg k/cm^3]
119+
constexpr Real geo_fac =
120+
6.0; // geometry factor (surf area/volume = geo_fac/diameter)
121+
constexpr Real xrm = .189; // mean diameter of rain drop [cm]
122+
constexpr Real xum = 748.0; // mean rain drop terminal velocity [cm/s]
123+
constexpr Real xeqca = 0.0;
124+
constexpr Real xca = 0.0;
124125

125126
// -----------------------------------------------------------------
126127
// ... calculate the saturation concentration eqca
@@ -222,23 +223,24 @@ void sethet(
222223
//-----------------------------------------------------------------------
223224
// ... local variables //FIXME: BAD CONSTANT
224225
//-----------------------------------------------------------------------
225-
Real xrm = .189; // mean diameter of rain drop [cm]
226-
Real xum = 748.0; // mean rain drop terminal velocity [cm/s]
227-
Real xvv = 6.18e-2; // kinetic viscosity [cm^2/s]
228-
Real xdg = .112; // mass transport coefficient [cm/s]
229-
Real t0 = 298.0; // reference temperature [K]
230-
Real xph0 = 1.0e-5; // cloud [h+]
231-
Real satf_hno3 = .016; // saturation factor for hno3 in clouds
232-
Real satf_h2o2 = .016; // saturation factor for h2o2 in clouds
233-
Real satf_so2 = .016; // saturation factor for so2 in clouds
234-
Real const0 = boltz_cgs * 1.0e-6; // [atmospheres/deg k/cm^3]
235-
Real hno3_diss = 15.4; // hno3 dissociation constant
236-
Real mass_air = 29.0; // mass of background atmosphere [amu]
237-
Real km2cm = 1.0e5; // convert km to cm
238-
Real m2km = 1.0e-3; // convert m to km
239-
Real m3_2_cm3 = 1.0e6; // convert m^3 to cm^3
240-
Real MISSING = -999999.0;
241-
Real large_value_lifetime = 1.0e29; // a large lifetime value if no washout
226+
constexpr Real xrm = .189; // mean diameter of rain drop [cm]
227+
constexpr Real xum = 748.0; // mean rain drop terminal velocity [cm/s]
228+
constexpr Real xvv = 6.18e-2; // kinetic viscosity [cm^2/s]
229+
constexpr Real xdg = .112; // mass transport coefficient [cm/s]
230+
constexpr Real t0 = 298.0; // reference temperature [K]
231+
constexpr Real xph0 = 1.0e-5; // cloud [h+]
232+
constexpr Real satf_hno3 = .016; // saturation factor for hno3 in clouds
233+
constexpr Real satf_h2o2 = .016; // saturation factor for h2o2 in clouds
234+
constexpr Real satf_so2 = .016; // saturation factor for so2 in clouds
235+
constexpr Real const0 = boltz_cgs * 1.0e-6; // [atmospheres/deg k/cm^3]
236+
constexpr Real hno3_diss = 15.4; // hno3 dissociation constant
237+
constexpr Real mass_air = 29.0; // mass of background atmosphere [amu]
238+
constexpr Real km2cm = 1.0e5; // convert km to cm
239+
constexpr Real m2km = 1.0e-3; // convert m to km
240+
constexpr Real m3_2_cm3 = 1.0e6; // convert m^3 to cm^3
241+
constexpr Real MISSING = -999999.0;
242+
constexpr Real large_value_lifetime =
243+
1.0e29; // a large lifetime value if no washout
242244

243245
int ktop; // tropopause level, 100mb for lat < 60 and 300mb for lat > 60
244246
Real xkgm; // mass flux on rain drop
@@ -279,8 +281,6 @@ void sethet(
279281
}
280282
}
281283

282-
// if ( .not. do_wetdep) return
283-
284284
for (int mm = 0; mm < gas_wetdep_cnt; mm++) {
285285
int mm2 = wetdep_map[mm];
286286
if (mm2 > 0) {
@@ -464,12 +464,6 @@ void sethet(
464464
return;
465465
}
466466
}
467-
// Didn't port
468-
// if ( any( het_rates(:ncol,:,mm2) == MISSING) ) then
469-
// write(hetratestrg,'(I3)') mm2
470-
// call endrun('sethet: het_rates (wet dep) not set for het reaction
471-
// number : '//hetratestrg)
472-
// endif
473467
}
474468
} // end subroutine sethet
475469

0 commit comments

Comments
 (0)