chore(ecalc-neqsim-wrapper): update to neqsim 2.5.9

equinor · Nov 30, 2023 · 51652c5 · 51652c5
1 parent f8e5052
commit 51652c5
Show file tree

Hide file tree

Showing 14 changed files with 5,558 additions and 5,597 deletions.
diff --git a/src/ecalc_neqsim_wrapper/lib/NeqSim.jar b/src/ecalc_neqsim_wrapper/lib/NeqSim.jar
diff --git a/src/ecalc_neqsim_wrapper/lib/neqsim_version_info.md b/src/ecalc_neqsim_wrapper/lib/neqsim_version_info.md
@@ -1,4 +1,6 @@
-Current neqsim.jar from latest release of NeqSim (v2.3.0 - https://github.com/equinor/neqsim/releases/tag/v2.3.0)
+Current neqsim.jar from latest release of NeqSim (v2.5.9 - https://github.com/equinor/neqsim/releases/tag/v2.5.9)
+
+NeqSim is currently not considered to be thread-safe. That means that two threads working towards the same gateway, interchangely changing a fluid setting will interfere with each other.
 
 If you need to manually compile a version, do the following:
 

diff --git a/src/tests/ecalc_cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv b/src/tests/ecalc_cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv
@@ -3,13 +3,13 @@ forecastYear	forecastMonth	turbineFuelGasConsumption	flareGasConsumption	engineD
 2021	01	33446239	5475000	3889000	70571.56	14235	10539.19	0	306.3675	7.665	118.6145	8.027097	0.3285	8.63358	38.325	0	229.95	30.43608	1.314	0	131.4	0	21.9	1095000	122.3544	0	0	74.46	7.446
 2022	01	693967897	3650000	3518600	1464272	9490	9535.406	0	6356.746	5.11	107.3173	166.5523	0.219	7.811292	43.07	0	229.95	631.5108	0.876	0	153.3	0	21.9	1095000	130.9912	50.34695	0	79.716	7.9716
 2023	01	533925330	3650000	3518600	1126582	9490	9535.406	0	4890.756	5.11	107.3173	128.1421	0.219	7.811292	43.435	0	214.62	485.8721	0.876	0	156.95	0	20.44	1022000	130.9912	66.29015	0	79.716	7.9716
-2024	01	311317525	5490000	3806400	656880	14274	10315.34	0	2851.669	7.686	116.0952	74.71621	0.3294	8.450208	42.822	0	192.15	283.2989	1.3176	0	151.89	0	18.3	915000	122.6897	410.5507	32.85216	41.81184	7.4664
-2025	01	411514576	3650000	3591600	868295.8	9490	9733.236	0	3769.474	5.11	109.5438	98.7635	0.219	7.973352	44.895	0	306.6	374.4783	0.876	0	160.6	0	29.2	1460000	138.1885	681.5826	37.00224	47.09376	8.4096
-2026	01	292918415	3650000	3591600	618057.9	9490	9733.236	0	2683.133	5.11	109.5438	70.30042	0.219	7.973352	45.26	0	459.9	266.5558	0.876	0	163.155	0	43.8	2190000	138.1885	468.6442	37.00224	47.09376	8.4096
-2027	01	234474109	3650000	3650000	494740.4	9490	9891.5	0	2147.783	5.11	111.325	56.27379	0.219	8.103	45.625	0	268.275	213.3714	0.876	0	163.885	0	25.55	1277500	138.1885	354.3552	37.00224	47.09376	8.4096
-2028	01	177822247	5490000	2562000	375204.9	14274	6943.02	0	1628.852	7.686	78.141	42.67734	0.3294	5.68764	43.554	0	153.72	161.8182	1.3176	0	155.916	0	14.64	732000	125.3474	325.7155	34.01165	43.28755	7.72992
-2029	01	192268355	3650000	2190000	405686.2	9490	5934.9	0	1761.178	5.11	66.795	46.14441	0.219	4.8618	45.26	0	137.97	174.9642	0.876	0	161.695	0	13.14	657000	134.7266	354.3552	37.00224	47.09376	8.4096
-2030	01	191921435	3650000	2190000	404954.2	9490	5934.9	0	1758	5.11	66.795	46.06114	0.219	4.8618	45.625	0	124.173	174.6485	0.876	0	163.155	0	11.826	591300	133.0609	354.3552	37.00224	47.09376	8.4096
-2031	01	177611209	3650000	2190000	374759.7	9490	5934.9	0	1626.919	5.11	66.795	42.62669	0.219	4.8618	45.625	0	111.7557	161.6262	0.876	0	163.155	0	10.6434	532170	131.5041	347.7349	37.00224	47.09376	8.4096
-2032	01	157108415	5490000	2562000	331498.8	14274	6943.02	0	1439.113	7.686	78.141	37.70602	0.3294	5.68764	43.554	0	100.8403	142.9687	1.3176	0	155.916	0	9.60384	480192	119.4056	316.8517	34.01165	43.28755	7.72992
+2024	01	311313690	5490000	3806400	656871.9	14274	10315.34	0	2851.633	7.686	116.0952	74.71529	0.3294	8.450208	42.822	0	192.15	283.2955	1.3176	0	151.89	0	18.3	915000	122.6897	410.534	32.85216	41.81184	7.4664
+2025	01	411507881	3650000	3591600	868281.6	9490	9733.236	0	3769.412	5.11	109.5438	98.76189	0.219	7.973352	44.895	0	306.6	374.4722	0.876	0	160.6	0	29.2	1460000	138.1885	681.5523	37.00224	47.09376	8.4096
+2026	01	292912559	3650000	3591600	618045.5	9490	9733.236	0	2683.079	5.11	109.5438	70.29901	0.219	7.973352	45.26	0	459.9	266.5504	0.876	0	163.155	0	43.8	2190000	138.1885	468.6233	37.00224	47.09376	8.4096
+2027	01	234469385	3650000	3650000	494730.4	9490	9891.5	0	2147.74	5.11	111.325	56.27265	0.219	8.103	45.625	0	268.275	213.3671	0.876	0	163.885	0	25.55	1277500	138.1885	354.3396	37.00224	47.09376	8.4096
+2028	01	177817905	5490000	2562000	375195.8	14274	6943.02	0	1628.812	7.686	78.141	42.6763	0.3294	5.68764	43.554	0	153.72	161.8143	1.3176	0	155.916	0	14.64	732000	125.3474	325.7012	34.01165	43.28755	7.72992
+2029	01	192263631	3650000	2190000	405676.3	9490	5934.9	0	1761.135	5.11	66.795	46.14327	0.219	4.8618	45.26	0	137.97	174.9599	0.876	0	161.695	0	13.14	657000	134.7266	354.3396	37.00224	47.09376	8.4096
+2030	01	191916710	3650000	2190000	404944.3	9490	5934.9	0	1757.957	5.11	66.795	46.06001	0.219	4.8618	45.625	0	124.173	174.6442	0.876	0	163.155	0	11.826	591300	133.0609	354.3396	37.00224	47.09376	8.4096
+2031	01	177606485	3650000	2190000	374749.7	9490	5934.9	0	1626.875	5.11	66.795	42.62556	0.219	4.8618	45.625	0	111.7557	161.6219	0.876	0	163.155	0	10.6434	532170	131.5041	347.7193	37.00224	47.09376	8.4096
+2032	01	157104073	5490000	2562000	331489.6	14274	6943.02	0	1439.073	7.686	78.141	37.70498	0.3294	5.68764	43.554	0	100.8403	142.9647	1.3176	0	155.916	0	9.60384	480192	119.4056	316.8373	34.01165	43.28755	7.72992
 2033	01	27668241	0	0	58379.99	0	0	0	253.4411	0	0	6.640378	0	0	0	0	0	25.1781	0	0	0	0	0	0	43.8	0	0	87.6	8.76
diff --git a/src/tests/ecalc_cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv.json b/src/tests/ecalc_cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv.json
@@ -36,15 +36,15 @@
     "1":"33446239",
     "2":"693967897",
     "3":"533925330",
-    "4":"311317525",
-    "5":"411514576",
-    "6":"292918415",
-    "7":"234474109",
-    "8":"177822247",
-    "9":"192268355",
-    "10":"191921435",
-    "11":"177611209",
-    "12":"157108415",
+    "4":"311313690",
+    "5":"411507881",
+    "6":"292912559",
+    "7":"234469385",
+    "8":"177817905",
+    "9":"192263631",
+    "10":"191916710",
+    "11":"177606485",
+    "12":"157104073",
     "13":"27668241"
   },
   "flareGasConsumption":{
@@ -84,15 +84,15 @@
     "1":"70571.56",
     "2":"1464272",
     "3":"1126582",
-    "4":"656880",
-    "5":"868295.8",
-    "6":"618057.9",
-    "7":"494740.4",
-    "8":"375204.9",
-    "9":"405686.2",
-    "10":"404954.2",
-    "11":"374759.7",
-    "12":"331498.8",
+    "4":"656871.9",
+    "5":"868281.6",
+    "6":"618045.5",
+    "7":"494730.4",
+    "8":"375195.8",
+    "9":"405676.3",
+    "10":"404944.3",
+    "11":"374749.7",
+    "12":"331489.6",
     "13":"58379.99"
   },
   "flareGasCo2Mass":{
@@ -148,15 +148,15 @@
     "1":"306.3675",
     "2":"6356.746",
     "3":"4890.756",
-    "4":"2851.669",
-    "5":"3769.474",
-    "6":"2683.133",
-    "7":"2147.783",
-    "8":"1628.852",
-    "9":"1761.178",
-    "10":"1758",
-    "11":"1626.919",
-    "12":"1439.113",
+    "4":"2851.633",
+    "5":"3769.412",
+    "6":"2683.079",
+    "7":"2147.74",
+    "8":"1628.812",
+    "9":"1761.135",
+    "10":"1757.957",
+    "11":"1626.875",
+    "12":"1439.073",
     "13":"253.4411"
   },
   "flareGasNoxMass":{
@@ -196,15 +196,15 @@
     "1":"8.027097",
     "2":"166.5523",
     "3":"128.1421",
-    "4":"74.71621",
-    "5":"98.7635",
-    "6":"70.30042",
-    "7":"56.27379",
-    "8":"42.67734",
-    "9":"46.14441",
-    "10":"46.06114",
-    "11":"42.62669",
-    "12":"37.70602",
+    "4":"74.71529",
+    "5":"98.76189",
+    "6":"70.29901",
+    "7":"56.27265",
+    "8":"42.6763",
+    "9":"46.14327",
+    "10":"46.06001",
+    "11":"42.62556",
+    "12":"37.70498",
     "13":"6.640378"
   },
   "flareGasNmvocMass":{
@@ -292,15 +292,15 @@
     "1":"30.43608",
     "2":"631.5108",
     "3":"485.8721",
-    "4":"283.2989",
-    "5":"374.4783",
-    "6":"266.5558",
-    "7":"213.3714",
-    "8":"161.8182",
-    "9":"174.9642",
-    "10":"174.6485",
-    "11":"161.6262",
-    "12":"142.9687",
+    "4":"283.2955",
+    "5":"374.4722",
+    "6":"266.5504",
+    "7":"213.3671",
+    "8":"161.8143",
+    "9":"174.9599",
+    "10":"174.6442",
+    "11":"161.6219",
+    "12":"142.9647",
     "13":"25.1781"
   },
   "flareGasCh4Mass":{
@@ -420,15 +420,15 @@
     "1":"0",
     "2":"50.34695",
     "3":"66.29015",
-    "4":"410.5507",
-    "5":"681.5826",
-    "6":"468.6442",
-    "7":"354.3552",
-    "8":"325.7155",
-    "9":"354.3552",
-    "10":"354.3552",
-    "11":"347.7349",
-    "12":"316.8517",
+    "4":"410.534",
+    "5":"681.5523",
+    "6":"468.6233",
+    "7":"354.3396",
+    "8":"325.7012",
+    "9":"354.3396",
+    "10":"354.3396",
+    "11":"347.7193",
+    "12":"316.8373",
     "13":"0"
   },
   "offshoreWindConsumption":{