master merge conflicts and finished TZ input updates

resources/data/custom_nodes/RE_potentials.csv

@@ -7,6 +7,22 @@ BIO,IDNNU,0.23
 BIO,IDNPP,0.51
 BIO,IDNSL,0.36
 BIO,IDNSM,17.98
+BIO,KHMXX,0.0002
+BIO,LAOXX,0.2
+BIO,MMRXX,11.64
+BIO,MYSPE,9.667
+BIO,MYSSH,9.667
+BIO,MYSSK,9.667
+BIO,PHLLU,0
+BIO,PHLMI,0
+BIO,PHLVI,0
+BIO,SGPXX,0
+BIO,THACE,2.333
+BIO,THANO,2.333
+BIO,THASO,2.333
+BIO,VNMCE,106.21
+BIO,VNMNO,106.21
+BIO,VNMSO,106.21
 GEO,BRNXX,0
 GEO,IDNJW,10.27
 GEO,IDNKA,0.05
@@ -55,75 +71,75 @@ HYD,THASO,0.31
 HYD,VNMCE,16.45
 HYD,VNMNO,16.16
 HYD,VNMSO,2.39
-SPV,BRNXX,0.46
-SPV,IDNJW,114.34
-SPV,IDNKA,48.72
-SPV,IDNML,3.51
-SPV,IDNNU,27.6
-SPV,IDNPP,19.17
-SPV,IDNSL,28.76
-SPV,IDNSM,83.97
-SPV,KHMXX,128.55
-SPV,LAOXX,42.02
-SPV,MMRXX,306.49
-SPV,MYSPE,22.4
-SPV,MYSSH,2.42
-SPV,MYSSK,5.55
-SPV,PHLLU,61.52
-SPV,PHLMI,27.62
-SPV,PHLVI,24.72
-SPV,SGPXX,0.66
-SPV,THACE,92.05
-SPV,THANO,100
-SPV,THASO,12.66
-SPV,VNMCE,55.27
-SPV,VNMNO,39.45
-SPV,VNMSO,60.3
-WOF,BRNXX,3.24
-WOF,IDNJW,344.45
-WOF,IDNKA,364.67
-WOF,IDNML,143.94
-WOF,IDNNU,14.56
-WOF,IDNPP,317.64
-WOF,IDNSL,154.68
-WOF,IDNSM,949.63
-WOF,KHMXX,25.67
+SPV,BRNXX,0.255
+SPV,IDNJW,58.455
+SPV,IDNKA,144.489
+SPV,IDNML,15.993
+SPV,IDNNU,116.257
+SPV,IDNPP,53.389
+SPV,IDNSL,56.349
+SPV,IDNSM,166.398
+SPV,KHMXX,268.131
+SPV,LAOXX,84.603
+SPV,MMRXX,722.69
+SPV,MYSPE,17.335
+SPV,MYSSH,4.645
+SPV,MYSSK,21.768
+SPV,PHLLU,86.286
+SPV,PHLMI,82.843
+SPV,PHLVI,36.614
+SPV,SGPXX,0.008
+SPV,THACE,88.858
+SPV,THANO,467.486
+SPV,THASO,12.13
+SPV,VNMCE,59.353
+SPV,VNMNO,34.462
+SPV,VNMSO,77.26
+WOF,BRNXX,37.323
+WOF,IDNJW,1075.116
+WOF,IDNKA,969.031
+WOF,IDNML,905.302
+WOF,IDNNU,180.272
+WOF,IDNPP,1205.57
+WOF,IDNSL,499.801
+WOF,IDNSM,2891.026
+WOF,KHMXX,195.511
 WOF,LAOXX,0
-WOF,MMRXX,273.99
-WOF,MYSPE,155.38
-WOF,MYSSH,45.04
-WOF,MYSSK,151.09
-WOF,PHLLU,207.77
-WOF,PHLMI,74.98
-WOF,PHLVI,62.29
-WOF,SGPXX,28.82
-WOF,THACE,83.63
-WOF,THANO,293.33
-WOF,THASO,183.97
-WOF,VNMCE,149.93
-WOF,VNMNO,23.34
-WOF,VNMSO,96.69
-WON,BRNXX,12.05
-WON,IDNJW,87.03
-WON,IDNKA,1429.82
-WON,IDNML,208.83
-WON,IDNNU,158.88
-WON,IDNPP,1021.64
-WON,IDNSL,421.86
-WON,IDNSM,1005.23
-WON,KHMXX,261.86
-WON,LAOXX,544.72
-WON,MMRXX,1780.77
-WON,MYSPE,240.45
-WON,MYSSH,159.68
-WON,MYSSK,356.29
-WON,PHLLU,234.67
-WON,PHLMI,248.92
-WON,PHLVI,110.17
-WON,SGPXX,0.19
-WON,THACE,79.83
-WON,THANO,100
-WON,THASO,90.9
-WON,VNMCE,272.42
-WON,VNMNO,265.84
-WON,VNMSO,44.47
+WOF,MMRXX,979.039
+WOF,MYSPE,820.431
+WOF,MYSSH,175.425
+WOF,MYSSK,572.175
+WOF,PHLLU,579.482
+WOF,PHLMI,440.988
+WOF,PHLVI,179.302
+WOF,SGPXX,1.827
+WOF,THACE,241.905
+WOF,THANO,0
+WOF,THASO,769.041
+WOF,VNMCE,365.036
+WOF,VNMNO,215.347
+WOF,VNMSO,1181.464
+WON,BRNXX,0.074
+WON,IDNJW,41.711
+WON,IDNKA,51.891
+WON,IDNML,3.539
+WON,IDNNU,30.295
+WON,IDNPP,10.102
+WON,IDNSL,21.992
+WON,IDNSM,83.905
+WON,KHMXX,205.638
+WON,LAOXX,63.805
+WON,MMRXX,494.034
+WON,MYSPE,12.455
+WON,MYSSH,1.506
+WON,MYSSK,5.528
+WON,PHLLU,55.51
+WON,PHLMI,54.981
+WON,PHLVI,21.025
+WON,SGPXX,0.004
+WON,THACE,67.981
+WON,THANO,360.974
+WON,THASO,9.174
+WON,VNMCE,42.102
+WON,VNMNO,23.886
+WON,VNMSO,57.481