Skip to content

Commit 817f8ec

Browse files
authored
Merge pull request #119 from firelab/rj-BHP1-1290-relative-humidity-tool
[BHP1-1290] Relative Humidity Tool
2 parents 8020557 + 60d1cc9 commit 817f8ec

13 files changed

Lines changed: 11248 additions & 8911 deletions

File tree

behave-lib/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ SET(SOURCE
9696
behave-mirror/src/behave/palmettoGallberry.cpp
9797
behave-mirror/src/behave/randfuel.cpp
9898
behave-mirror/src/behave/randthread.cpp
99+
behave-mirror/src/behave/relativeHumidity.cpp
99100
behave-mirror/src/behave/safety.cpp
100101
behave-mirror/src/behave/slopeTool.cpp
101102
behave-mirror/src/behave/species_master_table.cpp
@@ -151,6 +152,7 @@ SET(HEADERS
151152
behave-mirror/src/behave/palmettoGallberry.h
152153
behave-mirror/src/behave/randfuel.h
153154
behave-mirror/src/behave/randthread.h
155+
behave-mirror/src/behave/relativeHumidity.h
154156
behave-mirror/src/behave/safety.h
155157
behave-mirror/src/behave/slopeTool.h
156158
behave-mirror/src/behave/species_master_table.h

behave-lib/include/cpp/emscripten/glue.cpp

Lines changed: 269 additions & 181 deletions
Large diffs are not rendered by default.

behave-lib/include/cpp/emscripten/wrapper.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include "fineDeadFuelMoistureTool.cpp"
5151
#include "SIGFineDeadFuelMoistureTool.cpp"
5252
#include "vaporPressureDeficitCalculator.cpp"
53+
#include "relativeHumidity.cpp"
5354
#include "enums.cpp"
5455
#include "glue.cpp"
5556

behave-lib/include/idl/behave.idl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,3 +1420,23 @@ interface VaporPressureDeficitCalculator {
14201420
void setRelativeHumidity(double relativeHumidity, FractionUnits_FractionUnitsEnum units);
14211421
double getVaporPressureDeficit(PressureUnits_PressureUnitsEnum units);
14221422
};
1423+
1424+
interface RelativeHumidityTool {
1425+
void RelativeHumidityTool();
1426+
1427+
// Calculate
1428+
void calculate();
1429+
1430+
// Getters
1431+
double getDryBulbTemperature(TemperatureUnits_TemperatureUnitsEnum temperatureUnits);
1432+
double getSiteElevation(LengthUnits_LengthUnitsEnum lengthUnits);
1433+
double getWetBulbTemperature(TemperatureUnits_TemperatureUnitsEnum temperatureUnits);
1434+
double getDewPointTemperature(TemperatureUnits_TemperatureUnitsEnum temperatureUnits);
1435+
double getRelativeHumidity(FractionUnits_FractionUnitsEnum fractionUnits);
1436+
double getWetBulbDepression(TemperatureUnits_TemperatureUnitsEnum temperatureUnits);
1437+
1438+
// Setters
1439+
void setDryBulbTemperature(double dryBulbTemperature, TemperatureUnits_TemperatureUnitsEnum temperatureUnits);
1440+
void setSiteElevation(double siteElevation, LengthUnits_LengthUnitsEnum lengthUnits);
1441+
void setWetBulbTemperature(double wetBulbTemperature, TemperatureUnits_TemperatureUnitsEnum temperatureUnits);
1442+
};

0 commit comments

Comments
 (0)