Skip to content

Commit

Permalink
Code review fixes
Browse files Browse the repository at this point in the history 
 * Fix Celsius casing.
 * Formatting.
  • Loading branch information
@iliekturtles
iliekturtles committed Feb 8, 2023
1 parent 35157ac commit 98a9768
Showing 1 changed file with 89 additions and 84 deletions.
173 changes: 89 additions & 84 deletions src/si/thermal_conductance.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,107 +21,114 @@ quantity! {
Z0, // amount of substance
Z0>; // luminous intensity
units {
@yottagram_meter_per_second_cubed_kelvin: prefix!(yotta) / prefix!(kilo); "Yg · m²/(s³ · K)",
"yottagram meter squared per second cubed kelvin", "yottagrams meter squared per second cubed kelvin";
@zettagram_meter_per_second_cubed_kelvin: prefix!(zetta) / prefix!(kilo); "Zg · m²/(s³ · K)",
"zettagram meter squared per second cubed kelvin", "zettagrams meter squared per second cubed kelvin";
@yottagram_meter_per_second_cubed_kelvin: prefix!(yotta) / prefix!(kilo);
"Yg · m²/(s³ · K)", "yottagram meter squared per second cubed kelvin",
"yottagrams meter squared per second cubed kelvin";
@zettagram_meter_per_second_cubed_kelvin: prefix!(zetta) / prefix!(kilo);
"Zg · m²/(s³ · K)", "zettagram meter squared per second cubed kelvin",
"zettagrams meter squared per second cubed kelvin";
@exagram_meter_per_second_cubed_kelvin: prefix!(exa) / prefix!(kilo); "Eg · m²/(s³ · K)",
"exagram meter squared per second cubed kelvin", "exagrams meter squared per second cubed kelvin";
"exagram meter squared per second cubed kelvin",
"exagrams meter squared per second cubed kelvin";
@petagram_meter_per_second_cubed_kelvin: prefix!(peta) / prefix!(kilo); "Pg · m²/(s³ · K)",
"petagram meter squared per second cubed kelvin", "petagrams meter squared per second cubed kelvin";
"petagram meter squared per second cubed kelvin",
"petagrams meter squared per second cubed kelvin";
@teragram_meter_per_second_cubed_kelvin: prefix!(tera) / prefix!(kilo); "Tg · m²/(s³ · K)",
"teragram meter squared per second cubed kelvin", "teragrams meter squared per second cubed kelvin";
"teragram meter squared per second cubed kelvin",
"teragrams meter squared per second cubed kelvin";
@gigagram_meter_per_second_cubed_kelvin: prefix!(giga) / prefix!(kilo); "Gg · m²/(s³ · K)",
"gigagram meter squared per second cubed kelvin", "gigagrams meter squared per second cubed kelvin";
"gigagram meter squared per second cubed kelvin",
"gigagrams meter squared per second cubed kelvin";
@megagram_meter_per_second_cubed_kelvin: prefix!(mega) / prefix!(kilo); "Mg · m²/(s³ · K)",
"megagram meter squared per second cubed kelvin", "megagrams meter squared per second cubed kelvin";
"megagram meter squared per second cubed kelvin",
"megagrams meter squared per second cubed kelvin";
/// Derived unit of thermal conductance in base units. Equivalent to W/K.
@kilogram_meter_per_second_cubed_kelvin: prefix!(kilo) / prefix!(kilo); "kg · m²/(s³ · K)",
"kilogram meter squared per second cubed kelvin", "kilograms meter squared per second cubed kelvin";
@hectogram_meter_per_second_cubed_kelvin: prefix!(hecto) / prefix!(kilo); "hg · m²/(s³ · K)",
"hectogram meter squared per second cubed kelvin", "hectograms meter squared per second cubed kelvin";
"kilogram meter squared per second cubed kelvin",
"kilograms meter squared per second cubed kelvin";
@hectogram_meter_per_second_cubed_kelvin: prefix!(hecto) / prefix!(kilo);
"hg · m²/(s³ · K)", "hectogram meter squared per second cubed kelvin",
"hectograms meter squared per second cubed kelvin";
@decagram_meter_per_second_cubed_kelvin: prefix!(deca) / prefix!(kilo); "dag · m²/(s³ · K)",
"decagram meter squared per second cubed kelvin", "decagrams meter squared per second cubed kelvin";
"decagram meter squared per second cubed kelvin",
"decagrams meter squared per second cubed kelvin";
@gram_meter_per_second_cubed_kelvin: prefix!(none) / prefix!(kilo); "g · m/(s³ · K)",
"gram meter per second cubed kelvin", "grams meter per second cubed kelvin";
@decigram_meter_per_second_cubed_kelvin: prefix!(deci) / prefix!(kilo); "dg · m²/(s³ · K)",
"decigram meter squared per second cubed kelvin", "decigrams meter squared per second cubed kelvin";
@centigram_meter_per_second_cubed_kelvin: prefix!(centi) / prefix!(kilo); "cg · m²/(s³ · K)",
"centigram meter squared per second cubed kelvin", "centigrams meter squared per second cubed kelvin";
@milligram_meter_per_second_cubed_kelvin: prefix!(milli) / prefix!(kilo); "mg · m²/(s³ · K)",
"milligram meter squared per second cubed kelvin", "milligrams meter squared per second cubed kelvin";
"decigram meter squared per second cubed kelvin",
"decigrams meter squared per second cubed kelvin";
@centigram_meter_per_second_cubed_kelvin: prefix!(centi) / prefix!(kilo);
"cg · m²/(s³ · K)", "centigram meter squared per second cubed kelvin",
"centigrams meter squared per second cubed kelvin";
@milligram_meter_per_second_cubed_kelvin: prefix!(milli) / prefix!(kilo);
"mg · m²/(s³ · K)", "milligram meter squared per second cubed kelvin",
"milligrams meter squared per second cubed kelvin";
@microgram_meter_per_second_cubed_kelvin: prefix!(micro) / prefix!(kilo); "µg · m/(s³ · K)",
"microgram meter squared per second cubed kelvin", "micrograms meter squared per second cubed kelvin";
"microgram meter squared per second cubed kelvin",
"micrograms meter squared per second cubed kelvin";
@nanogram_meter_per_second_cubed_kelvin: prefix!(nano) / prefix!(kilo); "ng · m²/(s³ · K)",
"nanogram meter squared per second cubed kelvin", "nanograms meter squared per second cubed kelvin";
"nanogram meter squared per second cubed kelvin",
"nanograms meter squared per second cubed kelvin";
@picogram_meter_per_second_cubed_kelvin: prefix!(pico) / prefix!(kilo); "pg · m²/(s³ · K)",
"picogram meter squared per second cubed kelvin", "picograms meter squared per second cubed kelvin";
@femtogram_meter_per_second_cubed_kelvin: prefix!(femto) / prefix!(kilo); "fg · m²/(s³ · K)",
"femtogram meter squared per second cubed kelvin", "femtograms meter squared per second cubed kelvin";
"picogram meter squared per second cubed kelvin",
"picograms meter squared per second cubed kelvin";
@femtogram_meter_per_second_cubed_kelvin: prefix!(femto) / prefix!(kilo);
"fg · m²/(s³ · K)", "femtogram meter squared per second cubed kelvin",
"femtograms meter squared per second cubed kelvin";
@attogram_meter_per_second_cubed_kelvin: prefix!(atto) / prefix!(kilo); "ag · m²/(s³ · K)",
"attogram meter squared per second cubed kelvin", "attograms meter squared per second cubed kelvin";
@zeptogram_meter_per_second_cubed_kelvin: prefix!(zepto) / prefix!(kilo); "zg · m²/(s³ · K)",
"zeptogram meter squared per second cubed kelvin", "zeptograms meter squared per second cubed kelvin";
@yoctogram_meter_per_second_cubed_kelvin: prefix!(yocto) / prefix!(kilo); "yg · m²/(s³ · K)",
"yoctogram meter squared per second cubed kelvin", "yoctograms meter squared per second cubed kelvin";
"attogram meter squared per second cubed kelvin",
"attograms meter squared per second cubed kelvin";
@zeptogram_meter_per_second_cubed_kelvin: prefix!(zepto) / prefix!(kilo);
"zg · m²/(s³ · K)", "zeptogram meter squared per second cubed kelvin",
"zeptograms meter squared per second cubed kelvin";
@yoctogram_meter_per_second_cubed_kelvin: prefix!(yocto) / prefix!(kilo);
"yg · m²/(s³ · K)", "yoctogram meter squared per second cubed kelvin",
"yoctograms meter squared per second cubed kelvin";

// Thermal conductance is much more commonly expressed in terms of
// power / temperature.
@yottawatt_per_kelvin: prefix!(yotta); "YW/K",
"yottawatt per kelvin", "yottawatts per kelvin";
@zettawatt_per_kelvin: prefix!(zetta); "ZW/K",
"zettawatt per kelvin", "zettawatts per kelvin";
@exawatt_per_kelvin: prefix!(exa); "EW/K",
"exawatt per kelvin", "exawatts per kelvin";
@petawatt_per_kelvin: prefix!(peta); "PW/K",
"petawatt per kelvin", "petawatts per kelvin";
@terawatt_per_kelvin: prefix!(tera); "TW/K",
"terawatt per kelvin", "terawatts per kelvin";
@gigawatt_per_kelvin: prefix!(giga); "GW/K",
"gigawatt per kelvin", "gigawatts per kelvin";
@megawatt_per_kelvin: prefix!(mega); "MW/K",
"megawatt per kelvin", "megawatts per kelvin";
@kilowatt_per_kelvin: prefix!(kilo); "kW/K",
"kilowatt per kelvin", "kilowatts per kelvin";
@hectowatt_per_kelvin: prefix!(hecto); "hW/K",
"hectowatt per kelvin", "hectowatts per kelvin";
@decawatt_per_kelvin: prefix!(deca); "daW/K",
"decawatt per kelvin", "decawatts per kelvin";
// Thermal conductance is much more commonly expressed in terms of power / temperature.
@yottawatt_per_kelvin: prefix!(yotta); "YW/K", "yottawatt per kelvin",
"yottawatts per kelvin";
@zettawatt_per_kelvin: prefix!(zetta); "ZW/K", "zettawatt per kelvin",
"zettawatts per kelvin";
@exawatt_per_kelvin: prefix!(exa); "EW/K", "exawatt per kelvin", "exawatts per kelvin";
@petawatt_per_kelvin: prefix!(peta); "PW/K", "petawatt per kelvin", "petawatts per kelvin";
@terawatt_per_kelvin: prefix!(tera); "TW/K", "terawatt per kelvin", "terawatts per kelvin";
@gigawatt_per_kelvin: prefix!(giga); "GW/K", "gigawatt per kelvin", "gigawatts per kelvin";
@megawatt_per_kelvin: prefix!(mega); "MW/K", "megawatt per kelvin", "megawatts per kelvin";
@kilowatt_per_kelvin: prefix!(kilo); "kW/K", "kilowatt per kelvin", "kilowatts per kelvin";
@hectowatt_per_kelvin: prefix!(hecto); "hW/K", "hectowatt per kelvin",
"hectowatts per kelvin";
@decawatt_per_kelvin: prefix!(deca); "daW/K", "decawatt per kelvin", "decawatts per kelvin";
/// Derived unit of thermal conductance in derived units. Equivalent to kg · m²/(s³ · K).
@watt_per_kelvin: prefix!(none); "W/K",
"watt per kelvin", "watts per kelvin";
@deciwatt_per_kelvin: prefix!(deci); "dW/K",
"deciwatt per kelvin", "deciwatts per kelvin";
@centiwatt_per_kelvin: prefix!(centi); "cW/K",
"centiwatt per kelvin", "centiwatts per kelvin";
@milliwatt_per_kelvin: prefix!(milli); "mW/K",
"milliwatt per kelvin", "milliwatts per kelvin";
@microwatt_per_kelvin: prefix!(micro); "µW/K",
"microwatt per kelvin", "microwatts per kelvin";
@nanowatt_per_kelvin: prefix!(nano); "nW/K",
"nanowatt per kelvin", "nanowatts per kelvin";
@picowatt_per_kelvin: prefix!(pico); "pW/K",
"picowatt per kelvin", "picowatts per kelvin";
@femtowatt_per_kelvin: prefix!(femto); "fW/K",
"femtowatt per kelvin", "femtowatts per kelvin";
@attowatt_per_kelvin: prefix!(atto); "aW/K",
"attowatt per kelvin", "attowatts per kelvin";
@zeptowatt_per_kelvin: prefix!(zepto); "zW/K",
"zeptowatt per kelvin", "zeptowatts per kelvin";
@yoctowatt_per_kelvin: prefix!(yocto); "yW/K",
"yoctowatt per kelvin", "yoctowatts per kelvin";
@watt_per_kelvin: prefix!(none); "W/K", "watt per kelvin", "watts per kelvin";
@deciwatt_per_kelvin: prefix!(deci); "dW/K", "deciwatt per kelvin", "deciwatts per kelvin";
@centiwatt_per_kelvin: prefix!(centi); "cW/K", "centiwatt per kelvin",
"centiwatts per kelvin";
@milliwatt_per_kelvin: prefix!(milli); "mW/K", "milliwatt per kelvin",
"milliwatts per kelvin";
@microwatt_per_kelvin: prefix!(micro); "µW/K", "microwatt per kelvin",
"microwatts per kelvin";
@nanowatt_per_kelvin: prefix!(nano); "nW/K", "nanowatt per kelvin", "nanowatts per kelvin";
@picowatt_per_kelvin: prefix!(pico); "pW/K", "picowatt per kelvin", "picowatts per kelvin";
@femtowatt_per_kelvin: prefix!(femto); "fW/K", "femtowatt per kelvin",
"femtowatts per kelvin";
@attowatt_per_kelvin: prefix!(atto); "aW/K", "attowatt per kelvin", "attowatts per kelvin";
@zeptowatt_per_kelvin: prefix!(zepto); "zW/K", "zeptowatt per kelvin",
"zeptowatts per kelvin";
@yoctowatt_per_kelvin: prefix!(yocto); "yW/K", "yoctowatt per kelvin",
"yoctowatts per kelvin";

// Celsius for convenience.
@kilogram_meter_squared_per_second_cubed_degree_celsius: prefix!(kilo) / prefix!(kilo);
"kg · m²/(s³ · °C)", "kilogram meter squared per second cubed degree celsius",
"kilograms meter squared per second cubed degree celsius";
@kilowatt_per_degree_celsius: prefix!(kilo); "kW/°C",
"kilowatt per degree celsius", "kilowatts per degree celsius";
"kg · m²/(s³ · °C)", "kilogram meter squared per second cubed degree Celsius",
"kilograms meter squared per second cubed degree Celsius";
@kilowatt_per_degree_celsius: prefix!(kilo); "kW/°C", "kilowatt per degree Celsius",
"kilowatts per degree Celsius";
/// Derived unit of thermal conductance in derived units. Equivalent to kg · m²/(s³ · K).
@watt_per_meter_degree_celsius: prefix!(none); "W/°C",
"watt per degree celsius", "watts per degree celsius";
@milliwatt_per_degree_celsius: prefix!(milli); "mW/°C",
"milliwatt per degree celsius", "milliwatts per degree celsius";
@watt_per_meter_degree_celsius: prefix!(none); "W/°C", "watt per degree Celsius",
"watts per degree Celsius";
@milliwatt_per_degree_celsius: prefix!(milli); "mW/°C", "milliwatt per degree Celsius",
"milliwatts per degree Celsius";
}
}

Expand Down Expand Up @@ -214,11 +221,9 @@ mod tests {
test::<p::zeptowatt, l::meter, ti::kelvin, tc::zeptowatt_per_kelvin>();
test::<p::yoctowatt, l::meter, ti::kelvin, tc::yoctowatt_per_kelvin>();

test::<p::kilowatt, l::meter, ti::degree_celsius,
tc::kilowatt_per_degree_celsius>();
test::<p::kilowatt, l::meter, ti::degree_celsius, tc::kilowatt_per_degree_celsius>();
test::<p::watt, l::meter, ti::degree_celsius, tc::watt_per_meter_degree_celsius>();
test::<p::milliwatt, l::meter, ti::degree_celsius,
tc::milliwatt_per_degree_celsius>();
test::<p::milliwatt, l::meter, ti::degree_celsius, tc::milliwatt_per_degree_celsius>();

fn test<
P: p::Conversion<V>,
Expand Down

0 comments on commit 98a9768

Please sign in to comment.