Skip to content

WIP setup additional units and require sucessful test of all units to… #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MikeNeilson wants to merge 1 commit into
base: devops/flyway_migration
Choose a base branch
from
+21 −9
Draft

WIP setup additional units and require sucessful test of all units to… #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions schema/src/main/java/db/data/R__0002_units_and_parameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,18 @@ private void loadData() throws Exception {

JsonNode tmpConversions = mapper.readTree(
getData("db/custom/units_and_parameters/conversions.json"));

HashSet<String> existing = new HashSet<>();
tmpConversions.forEach( (conversion) -> {
//Conversion c = new Conversion(from, to, method)
Unit from = unitDefinitions.get(conversion.get(0).asText());
Unit to = unitDefinitions.get(conversion.get(1).asText());
if( from !=null && to != null ) {
if( from != null && to != null ) {
final String tracker = from.getAbbreviation() + "_" + to.getAbbreviation();
if (existing.contains(tracker)) {
throw new CwmsMigrationError(
"Found duplication conversion from " + from.getAbbreviation() + " to " + to.getAbbreviation() +
". To reduce confusion remove one of the entries."
);
}
String parts[] = conversion.get(2).asText().split(":");
String type = parts[0];
String function = parts[1].trim();
Expand All @@ -237,6 +243,7 @@ private void loadData() throws Exception {
Conversion c = new Conversion(from,to, method);
crc.update(c.toString().getBytes());
conversions.add(c);
existing.add(tracker);
}

});
Expand Down
6 changes: 1 addition & 5 deletions schema/src/main/resources/db/custom/units_and_parameters/conversions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
[ "acre", "ft2", "function: i*ft2_per_acre"],
[ "1000 acre", "acre", "linear: 1000 0"],
[ "ft2", "m2", "function: i*(m_per_ft^2)"],
[ "1000 m2", "m2", "linear: 1000 0"],
["1000 m2", "m2", "linear: unit_per_kilo 0"],
//["m3", "ac-ft", "function: (i/(m_per_ft^3))/ft2_per_acre"],
//["ac-ft", "m3", "linear: 1233.48183754752 0"],
["m3", "gal", "linear: m3_per_gal 0"],
["m3", "gal", "function: i / m3_per_gal"],
// ["1000 m3", "dsf", "*_per_k*[m3]/[1000 m3] | [ft3]/m_per_ft^3[m3] | [dsf]/ft3_per_dsf[ft3]"],
// ["1000 m3", "ft3", "*_per_k*[m3]/[1000 m3] | [ft3]/m_per_ft^3[m3]"],
// ["1000 m3", "gal", "*_per_k*[m3]/[1000 m3] | [gal]/m3_per_gal[m3]"],
Expand Down Expand Up @@ -113,7 +112,6 @@
// ["ac-ft", "dsf", "ft2_per_acre[ft3]/[ac-ft] | [dsf]/ft3_per_dsf[ft3]"],
["ac-ft", "ft3", "function: i * ft2_per_acre"],
["ft3", "m3", "function: i * m_per_ft^3"],
["m3", "1000 m3", "linear: 1000 0"],
// ["ac-ft", "gal", "ft2_per_acre[ft3]/[ac-ft] | m_per_ft^3[m3]/[ft3] | [gal]/m3_per_gal[m3]"],
// ["ac-ft", "kaf", "[kaf]/*_per_k*[ac-ft]"],
// ["ac-ft", "kdsf", "ft2_per_acre[ft3]/[ac-ft] | [dsf]/ft3_per_dsf[ft3] | [kdsf]/*_per_k*[dsf]"],
Expand Down Expand Up @@ -390,7 +388,6 @@
// ["kaf", "mgal", "*_per_k*[ac-ft]/[kaf] | ft2_per_acre[ft3]/[ac-ft] | m_per_ft^3[m3]/[ft3] | [gal]/m3_per_gal[m3] | [mgal]/*_per_M*[gal]"],
// ["kaf", "mile3", "*_per_k*[ac-ft]/[kaf] | ft2_per_acre[ft3]/[ac-ft] | [mile3]/ft_per_mile^3[ft3]"],
// ["kcfs", "KAF/mon", "*_per_k*[cfs]/[kcfs] | [ft3/s]/[cfs] | s_per_mon[s]/[mon] | [ac-ft]/ft2_per_acre[ft3] | [kaf]/*_per_k*[ac-ft] | [KAF]/[kaf]"],
["kcfs", "cfs", "linear: 1000 0"],
// ["kcfs", "cms", "*_per_k*[ft3/s]/[kcfs] | m_per_ft^3[m3]/[ft3] | [cms]/[m3/s]"],
// ["kcfs", "gpm", "*_per_k*[ft3/s]/[kcfs] | m_per_ft^3[m3]/[ft3] | [gal]/m3_per_gal[m3] | s_per_min[s]/[min] | [gpm]/[gal/min]"],
// ["kcfs", "kcms", "*_per_k*[ft3/s]/[kcfs] | m_per_ft^3[m3]/[ft3] | [cms]/[m3/s] | [kcms]/*_per_k*[cms]"],
Expand Down Expand Up @@ -536,7 +533,6 @@
// ["m3", "ac-ft", "[ft3]/m_per_ft^3[m3] | [ac-ft]/ft2_per_acre[ft3]"],
// ["m3", "dsf", "[ft3]/m_per_ft^3[m3] | [dsf]/ft3_per_dsf[ft3]"],
// ["m3", "ft3", "[ft3]/m_per_ft^3[m3]"],
["m3", "gal", "linear: m3_per_gal 0"],
// ["m3", "kaf", "[ft3]/m_per_ft^3[m3] | [ac-ft]/ft2_per_acre[ft3] | [kaf]/*_per_k*[ac-ft]"],
// ["m3", "kdsf", "[ft3]/m_per_ft^3[m3] | [dsf]/ft3_per_dsf[ft3] | [kdsf]/*_per_k*[dsf]"],
// ["m3", "kgal", "[gal]/m3_per_gal[m3] | [kgal]/*_per_k*[gal]"],
Expand Down
11 changes: 10 additions & 1 deletion schema/src/test/resources/units/conversions_to_test.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,13 @@ g/l,kg/l,1.0,0.001,0.0001,0.0001
kg/l,lbm/l,1.0,2.20462,0.0001,0.0001
ug/l,kg/l,1.0,1e-9,1e-9,1e-5
ug/l,lbm/l,1.0,2.20462e-9,0.00001,0.00001
m3,ac-ft,1.0,.000810714,.0000001,.00001
m3,ac-ft,1.0,.000810714,.0000001,.00001
$,k$,20,20000,.01,.01
1/ft,1/m,5,16.40419947506562,.0000001,.00001
acre,ft2,4.5,196020, .0001, .0001
1000 acre,acre,5.65, 5650, .1, .001
ft2,m2,5034.56,467.7259291,.000001,.000001
m3,gal,6.343, 1675.6432688, .000001, .00001
kW,W, 5.633, 5633, .01,.0001
MW,W, .0005, 500, .00001, .000001
MW,kW, 5.25, 5250, .1, .1
Loading