From 4b2d1f03b1572ce79529f374cdaa53466d29f2ba Mon Sep 17 00:00:00 2001 From: mcflugen Date: Wed, 9 Oct 2019 13:42:13 -0600 Subject: [PATCH 1/4] move metadata into pymt_hydrotrend package --- MANIFEST.in | 2 + .../data}/Hydrotrend/HYDRO.IN | 0 .../data}/Hydrotrend/HYDRO0.HYPS | 62 +-- .../data}/Hydrotrend/api.yaml | 0 .../data}/Hydrotrend/danube.hyps | 160 ++++---- .../data}/Hydrotrend/eel.hyps | 14 +- .../data}/Hydrotrend/ganges.hyps | 362 +++++++++--------- .../data}/Hydrotrend/hydro_config.txt | 0 .../data}/Hydrotrend/info.yaml | 0 .../data}/Hydrotrend/lanyang.hyps | 156 ++++---- .../data}/Hydrotrend/parameters.yaml | 0 .../data}/Hydrotrend/po.hyps | 204 +++++----- .../data}/Hydrotrend/run.yaml | 0 .../data}/Hydrotrend/waipaoa.hyps | 62 +-- 14 files changed, 512 insertions(+), 510 deletions(-) rename {meta => pymt_hydrotrend/data}/Hydrotrend/HYDRO.IN (100%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/HYDRO0.HYPS (95%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/api.yaml (100%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/danube.hyps (97%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/eel.hyps (99%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/ganges.hyps (94%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/hydro_config.txt (100%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/info.yaml (100%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/lanyang.hyps (97%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/parameters.yaml (100%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/po.hyps (97%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/run.yaml (100%) rename {meta => pymt_hydrotrend/data}/Hydrotrend/waipaoa.hyps (95%) diff --git a/MANIFEST.in b/MANIFEST.in index 643a86d..1bd0e80 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,4 @@ +include LICENSE include versioneer.py include pymt_hydrotrend/_version.py +recursive-include pymt_hydrotrend/data/ * diff --git a/meta/Hydrotrend/HYDRO.IN b/pymt_hydrotrend/data/Hydrotrend/HYDRO.IN similarity index 100% rename from meta/Hydrotrend/HYDRO.IN rename to pymt_hydrotrend/data/Hydrotrend/HYDRO.IN diff --git a/meta/Hydrotrend/HYDRO0.HYPS b/pymt_hydrotrend/data/Hydrotrend/HYDRO0.HYPS similarity index 95% rename from meta/Hydrotrend/HYDRO0.HYPS rename to pymt_hydrotrend/data/Hydrotrend/HYDRO0.HYPS index de1da08..0c550a5 100644 --- a/meta/Hydrotrend/HYDRO0.HYPS +++ b/pymt_hydrotrend/data/Hydrotrend/HYDRO0.HYPS @@ -1,31 +1,31 @@ -------------------------------------------------- -Hypsometry input file for HYDROTREND -First line: number of hypsometric bins -Other lines: altitude (m) and area in (km^2) data -------------------------------------------------- -25 -1 208.9168081 -51 375.2451287 -101 536.0996727 -151 727.1589437 -201 902.604255 -251 1096.567651 -301 1257.078121 -351 1414.457889 -401 1529.215605 -451 1630.798354 -501 1704.457117 -551 1769.103192 -601 1816.557667 -651 1862.242091 -701 1898.728609 -751 1932.088621 -801 1954.393164 -851 1969.016904 -901 1977.0094 -951 1981.623038 -1001 1984.268222 -1051 1985.923785 -1101 1986.740178 -1151 1986.92 -1201 1986.921 +------------------------------------------------- +Hypsometry input file for HYDROTREND +First line: number of hypsometric bins +Other lines: altitude (m) and area in (km^2) data +------------------------------------------------- +25 +1 208.9168081 +51 375.2451287 +101 536.0996727 +151 727.1589437 +201 902.604255 +251 1096.567651 +301 1257.078121 +351 1414.457889 +401 1529.215605 +451 1630.798354 +501 1704.457117 +551 1769.103192 +601 1816.557667 +651 1862.242091 +701 1898.728609 +751 1932.088621 +801 1954.393164 +851 1969.016904 +901 1977.0094 +951 1981.623038 +1001 1984.268222 +1051 1985.923785 +1101 1986.740178 +1151 1986.92 +1201 1986.921 diff --git a/meta/Hydrotrend/api.yaml b/pymt_hydrotrend/data/Hydrotrend/api.yaml similarity index 100% rename from meta/Hydrotrend/api.yaml rename to pymt_hydrotrend/data/Hydrotrend/api.yaml diff --git a/meta/Hydrotrend/danube.hyps b/pymt_hydrotrend/data/Hydrotrend/danube.hyps similarity index 97% rename from meta/Hydrotrend/danube.hyps rename to pymt_hydrotrend/data/Hydrotrend/danube.hyps index 04afe59..ea78d07 100644 --- a/meta/Hydrotrend/danube.hyps +++ b/pymt_hydrotrend/data/Hydrotrend/danube.hyps @@ -1,80 +1,80 @@ -------------------------------------------------- -Hypsometry input file for HYDROTREND -First line: number of hypsometric bins -Other lines: altitude (m) and area in (km^2) data -------------------------------------------------- -74 - 1.00000000 36689.00000000 - 51.00000000 132191.00000000 - 101.00000000 229211.00000000 - 151.00000000 295067.00000000 - 201.00000000 351232.00000000 - 251.00000000 392688.00000000 - 301.00000000 429703.00000000 - 351.00000000 464109.00000000 - 401.00000000 501105.00000000 - 451.00000000 536984.00000000 - 501.00000000 567790.00000000 - 551.00000000 594228.00000000 - 601.00000000 615946.00000000 - 651.00000000 635065.00000000 - 701.00000000 652189.00000000 - 751.00000000 668304.00000000 - 801.00000000 682128.00000000 - 851.00000000 695509.00000000 - 901.00000000 707387.00000000 - 951.00000000 718055.00000000 - 1001.00000000 727586.00000000 - 1051.00000000 736704.00000000 - 1101.00000000 744877.00000000 - 1151.00000000 752313.00000000 - 1201.00000000 758681.00000000 - 1251.00000000 764344.00000000 - 1301.00000000 769285.00000000 - 1351.00000000 773452.00000000 - 1401.00000000 776927.00000000 - 1451.00000000 780022.00000000 - 1501.00000000 782843.00000000 - 1551.00000000 785331.00000000 - 1601.00000000 787558.00000000 - 1651.00000000 789486.00000000 - 1701.00000000 791189.00000000 - 1751.00000000 792820.00000000 - 1801.00000000 794290.00000000 - 1851.00000000 795514.00000000 - 1901.00000000 796635.00000000 - 1951.00000000 797644.00000000 - 2001.00000000 798611.00000000 - 2051.00000000 799483.00000000 - 2101.00000000 800226.00000000 - 2151.00000000 800939.00000000 - 2201.00000000 801549.00000000 - 2251.00000000 802166.00000000 - 2301.00000000 802711.00000000 - 2351.00000000 803218.00000000 - 2401.00000000 803659.00000000 - 2451.00000000 804125.00000000 - 2501.00000000 804536.00000000 - 2551.00000000 804917.00000000 - 2601.00000000 805275.00000000 - 2651.00000000 805614.00000000 - 2701.00000000 805890.00000000 - 2751.00000000 806128.00000000 - 2801.00000000 806347.00000000 - 2851.00000000 806514.00000000 - 2901.00000000 806629.00000000 - 2951.00000000 806712.00000000 - 3001.00000000 806800.00000000 - 3051.00000000 806870.00000000 - 3101.00000000 806915.00000000 - 3151.00000000 806965.00000000 - 3201.00000000 806995.00000000 - 3251.00000000 807024.00000000 - 3301.00000000 807034.00000000 - 3351.00000000 807043.00000000 - 3401.00000000 807045.00000000 - 3451.00000000 807046.00000000 - 3501.00000000 807047.00000000 - 3551.00000000 807048.00000000 - 3601.00000000 807050.00000000 - 3651.00000000 807051.00000000 +------------------------------------------------- +Hypsometry input file for HYDROTREND +First line: number of hypsometric bins +Other lines: altitude (m) and area in (km^2) data +------------------------------------------------- +74 + 1.00000000 36689.00000000 + 51.00000000 132191.00000000 + 101.00000000 229211.00000000 + 151.00000000 295067.00000000 + 201.00000000 351232.00000000 + 251.00000000 392688.00000000 + 301.00000000 429703.00000000 + 351.00000000 464109.00000000 + 401.00000000 501105.00000000 + 451.00000000 536984.00000000 + 501.00000000 567790.00000000 + 551.00000000 594228.00000000 + 601.00000000 615946.00000000 + 651.00000000 635065.00000000 + 701.00000000 652189.00000000 + 751.00000000 668304.00000000 + 801.00000000 682128.00000000 + 851.00000000 695509.00000000 + 901.00000000 707387.00000000 + 951.00000000 718055.00000000 + 1001.00000000 727586.00000000 + 1051.00000000 736704.00000000 + 1101.00000000 744877.00000000 + 1151.00000000 752313.00000000 + 1201.00000000 758681.00000000 + 1251.00000000 764344.00000000 + 1301.00000000 769285.00000000 + 1351.00000000 773452.00000000 + 1401.00000000 776927.00000000 + 1451.00000000 780022.00000000 + 1501.00000000 782843.00000000 + 1551.00000000 785331.00000000 + 1601.00000000 787558.00000000 + 1651.00000000 789486.00000000 + 1701.00000000 791189.00000000 + 1751.00000000 792820.00000000 + 1801.00000000 794290.00000000 + 1851.00000000 795514.00000000 + 1901.00000000 796635.00000000 + 1951.00000000 797644.00000000 + 2001.00000000 798611.00000000 + 2051.00000000 799483.00000000 + 2101.00000000 800226.00000000 + 2151.00000000 800939.00000000 + 2201.00000000 801549.00000000 + 2251.00000000 802166.00000000 + 2301.00000000 802711.00000000 + 2351.00000000 803218.00000000 + 2401.00000000 803659.00000000 + 2451.00000000 804125.00000000 + 2501.00000000 804536.00000000 + 2551.00000000 804917.00000000 + 2601.00000000 805275.00000000 + 2651.00000000 805614.00000000 + 2701.00000000 805890.00000000 + 2751.00000000 806128.00000000 + 2801.00000000 806347.00000000 + 2851.00000000 806514.00000000 + 2901.00000000 806629.00000000 + 2951.00000000 806712.00000000 + 3001.00000000 806800.00000000 + 3051.00000000 806870.00000000 + 3101.00000000 806915.00000000 + 3151.00000000 806965.00000000 + 3201.00000000 806995.00000000 + 3251.00000000 807024.00000000 + 3301.00000000 807034.00000000 + 3351.00000000 807043.00000000 + 3401.00000000 807045.00000000 + 3451.00000000 807046.00000000 + 3501.00000000 807047.00000000 + 3551.00000000 807048.00000000 + 3601.00000000 807050.00000000 + 3651.00000000 807051.00000000 diff --git a/meta/Hydrotrend/eel.hyps b/pymt_hydrotrend/data/Hydrotrend/eel.hyps similarity index 99% rename from meta/Hydrotrend/eel.hyps rename to pymt_hydrotrend/data/Hydrotrend/eel.hyps index a2abc51..224778e 100644 --- a/meta/Hydrotrend/eel.hyps +++ b/pymt_hydrotrend/data/Hydrotrend/eel.hyps @@ -1,9 +1,9 @@ -------------------------------------------------- -Hypsometry input file for HYDROTREND -First line: number of hypsometric bins -Other lines: altitude (m) and area in (km^2) data -------------------------------------------------- -47 +------------------------------------------------- +Hypsometry input file for HYDROTREND +First line: number of hypsometric bins +Other lines: altitude (m) and area in (km^2) data +------------------------------------------------- +47 1.00000000 85.55767822 51.00000000 173.32917786 101.00000000 316.37355042 @@ -51,4 +51,4 @@ Other lines: altitude (m) and area in (km^2) data 2201.00000000 9272.14600909 2251.00000000 9272.30284245 2301.00000000 9272.30647286 - + diff --git a/meta/Hydrotrend/ganges.hyps b/pymt_hydrotrend/data/Hydrotrend/ganges.hyps similarity index 94% rename from meta/Hydrotrend/ganges.hyps rename to pymt_hydrotrend/data/Hydrotrend/ganges.hyps index 268013b..448ba6b 100644 --- a/meta/Hydrotrend/ganges.hyps +++ b/pymt_hydrotrend/data/Hydrotrend/ganges.hyps @@ -1,182 +1,182 @@ -------------------------------------------------- -Hypsometry input file for HYDROTREND -First line: number of hypsometric bins -Other lines: altitude (m) and area in (km^2) data -------------------------------------------------- -176 -1 79166.85938 -51 201457.8359 -101 302548.8281 -151 390944.8125 -201 445567.7461 -251 489454.9102 -301 539488.3398 -351 583414.4023 -401 636743.8945 -451 689248.25 -501 717830.3398 -551 730472.9785 -601 737998.7148 -651 743258.5015 -701 747400.6489 -751 750883.7334 -801 754449.8552 -851 758099.0146 -901 761200.5757 -951 764145.7869 -1001 767147.8525 -1051 769828.2417 -1101 772736.0486 -1151 775496.4827 -1201 778376.6104 -1251 781174.4487 -1301 783940.8677 -1351 786423.0142 -1401 789135.5708 -1451 791952.1113 -1501 794629.5081 -1551 797220.875 -1601 799630.4573 -1651 801756.5151 -1701 804084.5562 -1751 806319.0864 -1801 808389.7861 -1851 810389.4177 -1901 812193.051 -1951 813699.6945 -2001 815364.1838 -2051 816987.5286 -2101 818534.5686 -2151 820027.7466 -2201 821366.819 -2251 822487.4506 -2301 823765.1799 -2351 825062.3596 -2401 826295.204 -2451 827600.6125 -2501 828787.0756 -2551 829792.502 -2601 830796.4323 -2651 831969.4298 -2701 833030.2146 -2751 834115.6862 -2801 835129.3416 -2851 836049.4863 -2901 836897.0667 -2951 838025.1791 -3001 839112.895 -3051 840242.5035 -3101 841218.7546 -3151 842041.6483 -3201 842904.1904 -3251 843917.0977 -3301 844924.0203 -3351 845912.9889 -3401 846899.7132 -3451 847675.4775 -3501 848397.3796 -3551 849403.5541 -3601 850364.0955 -3651 851194.47 -3701 852182.6904 -3751 853034.0113 -3801 853834.4624 -3851 854890.7587 -3901 855871.4983 -3951 856849.2455 -4001 857872.626 -4051 858896.7546 -4101 859881.9827 -4151 861595.8458 -4201 863240.1369 -4251 864735.5591 -4301 866495.0554 -4351 868797.6613 -4401 870702.2861 -4451 873218.8444 -4501 875477.3134 -4551 881350.5297 -4601 885521.1044 -4651 890483.9013 -4701 894626.7968 -4751 899039.7509 -4801 903499.8344 -4851 908259.1523 -4901 912841.9218 -4951 917331.1806 -5001 921561.602 -5051 926048.6166 -5101 930783.9955 -5151 936383.413 -5201 940669.1928 -5251 944652.7463 -5301 948438.0571 -5351 952165.0173 -5401 955906.9391 -5451 959918.1716 -5501 963034.6943 -5551 965672.4426 -5601 968019.9338 -5651 970070.4352 -5701 972180.7834 -5751 974283.6508 -5801 975901.0109 -5851 977101.6876 -5901 978034.5497 -5951 978797.5966 -6001 979481.3464 -6051 980152.3787 -6101 980581.0315 -6151 980914.6775 -6201 981185.4843 -6251 981409.1617 -6301 981605.16 -6351 981801.1584 -6401 981972.4698 -6451 982128.8196 -6501 982260.4826 -6551 982377.932 -6601 982499.1218 -6651 982623.3039 -6701 982736.2648 -6751 982802.0963 -6801 982872.4163 -6851 982930.7669 -6901 982963.6826 -6951 982995.8503 -7001 983025.7737 -7051 983051.2086 -7101 983075.8954 -7151 983093.1014 -7201 983117.0401 -7251 983136.4903 -7301 983156.6886 -7351 983171.6503 -7401 983186.612 -7451 983196.3371 -7501 983202.3218 -7551 983212.0469 -7601 983217.2835 -7651 983223.2682 -7701 983230.001 -7751 983233.7414 -7801 983239.7261 -7851 983244.2146 -7901 983247.2069 -7951 983249.4512 -8001 983253.1916 -8051 983255.4358 -8101 983256.1839 -8151 983257.6801 -8201 983262.1686 -8251 983264.4129 -8301 983265.161 -8351 983268.1533 -8401 983269.6495 -8451 983271.1456 -8501 983271.8937 -8551 983274.138 -8601 983274.1381 -8651 983275.6342 -8701 983275.6343 +------------------------------------------------- +Hypsometry input file for HYDROTREND +First line: number of hypsometric bins +Other lines: altitude (m) and area in (km^2) data +------------------------------------------------- +176 +1 79166.85938 +51 201457.8359 +101 302548.8281 +151 390944.8125 +201 445567.7461 +251 489454.9102 +301 539488.3398 +351 583414.4023 +401 636743.8945 +451 689248.25 +501 717830.3398 +551 730472.9785 +601 737998.7148 +651 743258.5015 +701 747400.6489 +751 750883.7334 +801 754449.8552 +851 758099.0146 +901 761200.5757 +951 764145.7869 +1001 767147.8525 +1051 769828.2417 +1101 772736.0486 +1151 775496.4827 +1201 778376.6104 +1251 781174.4487 +1301 783940.8677 +1351 786423.0142 +1401 789135.5708 +1451 791952.1113 +1501 794629.5081 +1551 797220.875 +1601 799630.4573 +1651 801756.5151 +1701 804084.5562 +1751 806319.0864 +1801 808389.7861 +1851 810389.4177 +1901 812193.051 +1951 813699.6945 +2001 815364.1838 +2051 816987.5286 +2101 818534.5686 +2151 820027.7466 +2201 821366.819 +2251 822487.4506 +2301 823765.1799 +2351 825062.3596 +2401 826295.204 +2451 827600.6125 +2501 828787.0756 +2551 829792.502 +2601 830796.4323 +2651 831969.4298 +2701 833030.2146 +2751 834115.6862 +2801 835129.3416 +2851 836049.4863 +2901 836897.0667 +2951 838025.1791 +3001 839112.895 +3051 840242.5035 +3101 841218.7546 +3151 842041.6483 +3201 842904.1904 +3251 843917.0977 +3301 844924.0203 +3351 845912.9889 +3401 846899.7132 +3451 847675.4775 +3501 848397.3796 +3551 849403.5541 +3601 850364.0955 +3651 851194.47 +3701 852182.6904 +3751 853034.0113 +3801 853834.4624 +3851 854890.7587 +3901 855871.4983 +3951 856849.2455 +4001 857872.626 +4051 858896.7546 +4101 859881.9827 +4151 861595.8458 +4201 863240.1369 +4251 864735.5591 +4301 866495.0554 +4351 868797.6613 +4401 870702.2861 +4451 873218.8444 +4501 875477.3134 +4551 881350.5297 +4601 885521.1044 +4651 890483.9013 +4701 894626.7968 +4751 899039.7509 +4801 903499.8344 +4851 908259.1523 +4901 912841.9218 +4951 917331.1806 +5001 921561.602 +5051 926048.6166 +5101 930783.9955 +5151 936383.413 +5201 940669.1928 +5251 944652.7463 +5301 948438.0571 +5351 952165.0173 +5401 955906.9391 +5451 959918.1716 +5501 963034.6943 +5551 965672.4426 +5601 968019.9338 +5651 970070.4352 +5701 972180.7834 +5751 974283.6508 +5801 975901.0109 +5851 977101.6876 +5901 978034.5497 +5951 978797.5966 +6001 979481.3464 +6051 980152.3787 +6101 980581.0315 +6151 980914.6775 +6201 981185.4843 +6251 981409.1617 +6301 981605.16 +6351 981801.1584 +6401 981972.4698 +6451 982128.8196 +6501 982260.4826 +6551 982377.932 +6601 982499.1218 +6651 982623.3039 +6701 982736.2648 +6751 982802.0963 +6801 982872.4163 +6851 982930.7669 +6901 982963.6826 +6951 982995.8503 +7001 983025.7737 +7051 983051.2086 +7101 983075.8954 +7151 983093.1014 +7201 983117.0401 +7251 983136.4903 +7301 983156.6886 +7351 983171.6503 +7401 983186.612 +7451 983196.3371 +7501 983202.3218 +7551 983212.0469 +7601 983217.2835 +7651 983223.2682 +7701 983230.001 +7751 983233.7414 +7801 983239.7261 +7851 983244.2146 +7901 983247.2069 +7951 983249.4512 +8001 983253.1916 +8051 983255.4358 +8101 983256.1839 +8151 983257.6801 +8201 983262.1686 +8251 983264.4129 +8301 983265.161 +8351 983268.1533 +8401 983269.6495 +8451 983271.1456 +8501 983271.8937 +8551 983274.138 +8601 983274.1381 +8651 983275.6342 +8701 983275.6343 8751 983276.3823 \ No newline at end of file diff --git a/meta/Hydrotrend/hydro_config.txt b/pymt_hydrotrend/data/Hydrotrend/hydro_config.txt similarity index 100% rename from meta/Hydrotrend/hydro_config.txt rename to pymt_hydrotrend/data/Hydrotrend/hydro_config.txt diff --git a/meta/Hydrotrend/info.yaml b/pymt_hydrotrend/data/Hydrotrend/info.yaml similarity index 100% rename from meta/Hydrotrend/info.yaml rename to pymt_hydrotrend/data/Hydrotrend/info.yaml diff --git a/meta/Hydrotrend/lanyang.hyps b/pymt_hydrotrend/data/Hydrotrend/lanyang.hyps similarity index 97% rename from meta/Hydrotrend/lanyang.hyps rename to pymt_hydrotrend/data/Hydrotrend/lanyang.hyps index 62852ee..4ffb3af 100644 --- a/meta/Hydrotrend/lanyang.hyps +++ b/pymt_hydrotrend/data/Hydrotrend/lanyang.hyps @@ -1,78 +1,78 @@ -------------------------------------------------- -Hypsometry input file for HYDROTREND -First line: number of hypsometric bins -Other lines: altitude (m) and area in (km^2) data -------------------------------------------------- -72 - 1.00000000 86.00000000 - 51.00000000 125.00000000 - 101.00000000 138.00000000 - 151.00000000 170.00000000 - 201.00000000 186.00000000 - 251.00000000 224.00000000 - 301.00000000 236.00000000 - 351.00000000 260.00000000 - 401.00000000 276.00000000 - 451.00000000 302.00000000 - 501.00000000 320.00000000 - 551.00000000 346.00000000 - 601.00000000 366.00000000 - 651.00000000 394.00000000 - 701.00000000 408.00000000 - 751.00000000 430.00000000 - 801.00000000 451.00000000 - 851.00000000 485.00000000 - 901.00000000 504.00000000 - 951.00000000 525.00000000 - 1001.00000000 541.00000000 - 1051.00000000 568.00000000 - 1101.00000000 583.00000000 - 1151.00000000 602.00000000 - 1201.00000000 622.00000000 - 1251.00000000 648.00000000 - 1301.00000000 672.00000000 - 1351.00000000 697.00000000 - 1401.00000000 706.00000000 - 1451.00000000 726.00000000 - 1501.00000000 739.00000000 - 1551.00000000 763.00000000 - 1601.00000000 779.00000000 - 1651.00000000 792.00000000 - 1701.00000000 805.00000000 - 1751.00000000 821.00000000 - 1801.00000000 833.00000000 - 1851.00000000 846.00000000 - 1901.00000000 855.00000000 - 1951.00000000 865.00000000 - 2001.00000000 873.00000000 - 2051.00000000 883.00000000 - 2101.00000000 889.00000000 - 2151.00000000 896.00000000 - 2201.00000000 903.00000000 - 2251.00000000 911.00000000 - 2301.00000000 917.00000000 - 2351.00000000 920.00000000 - 2401.00000000 923.00000000 - 2451.00000000 927.00000000 - 2501.00000000 928.00000000 - 2551.00000000 932.00000000 - 2601.00000000 935.00000000 - 2651.00000000 939.00000000 - 2701.00000000 942.00000000 - 2751.00000000 946.00000000 - 2801.00000000 946.00000001 - 2851.00000000 949.00000000 - 2901.00000000 949.00000001 - 2951.00000000 951.00000000 - 3001.00000000 951.00000001 - 3051.00000000 952.00000000 - 3101.00000000 952.00000001 - 3151.00000000 954.00000000 - 3201.00000000 955.00000000 - 3251.00000000 955.00000001 - 3301.00000000 957.00000000 - 3351.00000000 957.00000001 - 3401.00000000 957.00000002 - 3451.00000000 958.00000000 - 3501.00000000 958.00000001 - 3551.00000000 959.00000000 +------------------------------------------------- +Hypsometry input file for HYDROTREND +First line: number of hypsometric bins +Other lines: altitude (m) and area in (km^2) data +------------------------------------------------- +72 + 1.00000000 86.00000000 + 51.00000000 125.00000000 + 101.00000000 138.00000000 + 151.00000000 170.00000000 + 201.00000000 186.00000000 + 251.00000000 224.00000000 + 301.00000000 236.00000000 + 351.00000000 260.00000000 + 401.00000000 276.00000000 + 451.00000000 302.00000000 + 501.00000000 320.00000000 + 551.00000000 346.00000000 + 601.00000000 366.00000000 + 651.00000000 394.00000000 + 701.00000000 408.00000000 + 751.00000000 430.00000000 + 801.00000000 451.00000000 + 851.00000000 485.00000000 + 901.00000000 504.00000000 + 951.00000000 525.00000000 + 1001.00000000 541.00000000 + 1051.00000000 568.00000000 + 1101.00000000 583.00000000 + 1151.00000000 602.00000000 + 1201.00000000 622.00000000 + 1251.00000000 648.00000000 + 1301.00000000 672.00000000 + 1351.00000000 697.00000000 + 1401.00000000 706.00000000 + 1451.00000000 726.00000000 + 1501.00000000 739.00000000 + 1551.00000000 763.00000000 + 1601.00000000 779.00000000 + 1651.00000000 792.00000000 + 1701.00000000 805.00000000 + 1751.00000000 821.00000000 + 1801.00000000 833.00000000 + 1851.00000000 846.00000000 + 1901.00000000 855.00000000 + 1951.00000000 865.00000000 + 2001.00000000 873.00000000 + 2051.00000000 883.00000000 + 2101.00000000 889.00000000 + 2151.00000000 896.00000000 + 2201.00000000 903.00000000 + 2251.00000000 911.00000000 + 2301.00000000 917.00000000 + 2351.00000000 920.00000000 + 2401.00000000 923.00000000 + 2451.00000000 927.00000000 + 2501.00000000 928.00000000 + 2551.00000000 932.00000000 + 2601.00000000 935.00000000 + 2651.00000000 939.00000000 + 2701.00000000 942.00000000 + 2751.00000000 946.00000000 + 2801.00000000 946.00000001 + 2851.00000000 949.00000000 + 2901.00000000 949.00000001 + 2951.00000000 951.00000000 + 3001.00000000 951.00000001 + 3051.00000000 952.00000000 + 3101.00000000 952.00000001 + 3151.00000000 954.00000000 + 3201.00000000 955.00000000 + 3251.00000000 955.00000001 + 3301.00000000 957.00000000 + 3351.00000000 957.00000001 + 3401.00000000 957.00000002 + 3451.00000000 958.00000000 + 3501.00000000 958.00000001 + 3551.00000000 959.00000000 diff --git a/meta/Hydrotrend/parameters.yaml b/pymt_hydrotrend/data/Hydrotrend/parameters.yaml similarity index 100% rename from meta/Hydrotrend/parameters.yaml rename to pymt_hydrotrend/data/Hydrotrend/parameters.yaml diff --git a/meta/Hydrotrend/po.hyps b/pymt_hydrotrend/data/Hydrotrend/po.hyps similarity index 97% rename from meta/Hydrotrend/po.hyps rename to pymt_hydrotrend/data/Hydrotrend/po.hyps index 4f8dcb5..7f81d99 100644 --- a/meta/Hydrotrend/po.hyps +++ b/pymt_hydrotrend/data/Hydrotrend/po.hyps @@ -1,102 +1,102 @@ -------------------------------------------------- -Hypsometry input file for HYDROTREND -First line: number of hypsometric bins -Other lines: altitude (m) and area in (km^2) data -------------------------------------------------- -96 - 3.00000000 10276.26074219 - 53.00000000 16885.26757812 - 103.00000000 21814.69238281 - 153.00000000 25670.77465820 - 203.00000000 29984.02124023 - 253.00000000 33243.80224609 - 303.00000000 35927.15844727 - 353.00000000 37924.76806641 - 403.00000000 39554.65856934 - 453.00000000 41164.67236328 - 503.00000000 42615.67236328 - 553.00000000 43977.22717285 - 603.00000000 45348.72033691 - 653.00000000 46531.38476562 - 703.00000000 47654.41906738 - 753.00000000 48588.62457275 - 803.00000000 49642.09039307 - 853.00000000 50635.92602539 - 903.00000000 51629.76165771 - 953.00000000 52593.78222656 - 1003.00000000 53428.60418701 - 1053.00000000 54352.87133789 - 1103.00000000 55157.87823486 - 1153.00000000 55813.80975342 - 1203.00000000 56519.43304443 - 1253.00000000 57205.17962646 - 1303.00000000 57930.67962646 - 1353.00000000 58676.05633545 - 1403.00000000 59312.11114502 - 1453.00000000 59789.15225220 - 1503.00000000 60524.59060669 - 1553.00000000 61170.58377075 - 1603.00000000 61617.80981445 - 1653.00000000 62233.98791504 - 1703.00000000 62850.16601562 - 1753.00000000 63655.17291260 - 1803.00000000 64350.85784912 - 1853.00000000 64957.09759521 - 1903.00000000 65513.64556885 - 1953.00000000 66239.14556885 - 2003.00000000 66775.81683350 - 2053.00000000 67352.24151611 - 2103.00000000 67859.09768677 - 2153.00000000 68435.52236938 - 2203.00000000 69031.82376099 - 2253.00000000 69469.11145020 - 2303.00000000 70065.41284180 - 2353.00000000 70482.82382202 - 2403.00000000 70959.86492920 - 2453.00000000 71407.09097290 - 2503.00000000 71824.50195312 - 2553.00000000 72192.22113037 - 2603.00000000 72500.31018066 - 2653.00000000 72868.02935791 - 2703.00000000 73116.48826599 - 2753.00000000 73335.13211060 - 2803.00000000 73454.39238739 - 2853.00000000 73613.40608978 - 2903.00000000 73712.78964996 - 2953.00000000 73822.11157227 - 3003.00000000 73931.43349457 - 3053.00000000 74040.75541687 - 3103.00000000 74100.38555527 - 3153.00000000 74120.26226807 - 3203.00000000 74160.01569366 - 3253.00000000 74179.89240646 - 3303.00000000 74179.89240647 - 3353.00000000 74189.83076286 - 3403.00000000 74229.58418846 - 3453.00000000 74239.52254484 - 3503.00000000 74239.52254485 - 3553.00000000 74239.52254486 - 3603.00000000 74249.46090120 - 3653.00000000 74249.46090121 - 3703.00000000 74249.46090122 - 3753.00000000 74249.46090123 - 3803.00000000 74249.46090124 - 3853.00000000 74249.46090125 - 3903.00000000 74249.46090126 - 3953.00000000 74250.39925766 - 4003.00000000 74250.69925766 - 4053.00000000 74251.39925766 - 4103.00000000 74251.69925766 - 4153.00000000 74252.39925766 - 4203.00000000 74252.69925766 - 4253.00000000 74253.39925766 - 4303.00000000 74253.69925766 - 4353.00000000 74254.39925766 - 4403.00000000 74254.69925766 - 4453.00000000 74255.39925766 - 4503.00000000 74255.69925766 - 4553.00000000 74256.39925766 - 4603.00000000 74256.69925766 - 4653.00000000 74257.39925766 - 4703.00000000 74258.39925766 - 4753.00000000 74259.39925766 +------------------------------------------------- +Hypsometry input file for HYDROTREND +First line: number of hypsometric bins +Other lines: altitude (m) and area in (km^2) data +------------------------------------------------- +96 + 3.00000000 10276.26074219 + 53.00000000 16885.26757812 + 103.00000000 21814.69238281 + 153.00000000 25670.77465820 + 203.00000000 29984.02124023 + 253.00000000 33243.80224609 + 303.00000000 35927.15844727 + 353.00000000 37924.76806641 + 403.00000000 39554.65856934 + 453.00000000 41164.67236328 + 503.00000000 42615.67236328 + 553.00000000 43977.22717285 + 603.00000000 45348.72033691 + 653.00000000 46531.38476562 + 703.00000000 47654.41906738 + 753.00000000 48588.62457275 + 803.00000000 49642.09039307 + 853.00000000 50635.92602539 + 903.00000000 51629.76165771 + 953.00000000 52593.78222656 + 1003.00000000 53428.60418701 + 1053.00000000 54352.87133789 + 1103.00000000 55157.87823486 + 1153.00000000 55813.80975342 + 1203.00000000 56519.43304443 + 1253.00000000 57205.17962646 + 1303.00000000 57930.67962646 + 1353.00000000 58676.05633545 + 1403.00000000 59312.11114502 + 1453.00000000 59789.15225220 + 1503.00000000 60524.59060669 + 1553.00000000 61170.58377075 + 1603.00000000 61617.80981445 + 1653.00000000 62233.98791504 + 1703.00000000 62850.16601562 + 1753.00000000 63655.17291260 + 1803.00000000 64350.85784912 + 1853.00000000 64957.09759521 + 1903.00000000 65513.64556885 + 1953.00000000 66239.14556885 + 2003.00000000 66775.81683350 + 2053.00000000 67352.24151611 + 2103.00000000 67859.09768677 + 2153.00000000 68435.52236938 + 2203.00000000 69031.82376099 + 2253.00000000 69469.11145020 + 2303.00000000 70065.41284180 + 2353.00000000 70482.82382202 + 2403.00000000 70959.86492920 + 2453.00000000 71407.09097290 + 2503.00000000 71824.50195312 + 2553.00000000 72192.22113037 + 2603.00000000 72500.31018066 + 2653.00000000 72868.02935791 + 2703.00000000 73116.48826599 + 2753.00000000 73335.13211060 + 2803.00000000 73454.39238739 + 2853.00000000 73613.40608978 + 2903.00000000 73712.78964996 + 2953.00000000 73822.11157227 + 3003.00000000 73931.43349457 + 3053.00000000 74040.75541687 + 3103.00000000 74100.38555527 + 3153.00000000 74120.26226807 + 3203.00000000 74160.01569366 + 3253.00000000 74179.89240646 + 3303.00000000 74179.89240647 + 3353.00000000 74189.83076286 + 3403.00000000 74229.58418846 + 3453.00000000 74239.52254484 + 3503.00000000 74239.52254485 + 3553.00000000 74239.52254486 + 3603.00000000 74249.46090120 + 3653.00000000 74249.46090121 + 3703.00000000 74249.46090122 + 3753.00000000 74249.46090123 + 3803.00000000 74249.46090124 + 3853.00000000 74249.46090125 + 3903.00000000 74249.46090126 + 3953.00000000 74250.39925766 + 4003.00000000 74250.69925766 + 4053.00000000 74251.39925766 + 4103.00000000 74251.69925766 + 4153.00000000 74252.39925766 + 4203.00000000 74252.69925766 + 4253.00000000 74253.39925766 + 4303.00000000 74253.69925766 + 4353.00000000 74254.39925766 + 4403.00000000 74254.69925766 + 4453.00000000 74255.39925766 + 4503.00000000 74255.69925766 + 4553.00000000 74256.39925766 + 4603.00000000 74256.69925766 + 4653.00000000 74257.39925766 + 4703.00000000 74258.39925766 + 4753.00000000 74259.39925766 diff --git a/meta/Hydrotrend/run.yaml b/pymt_hydrotrend/data/Hydrotrend/run.yaml similarity index 100% rename from meta/Hydrotrend/run.yaml rename to pymt_hydrotrend/data/Hydrotrend/run.yaml diff --git a/meta/Hydrotrend/waipaoa.hyps b/pymt_hydrotrend/data/Hydrotrend/waipaoa.hyps similarity index 95% rename from meta/Hydrotrend/waipaoa.hyps rename to pymt_hydrotrend/data/Hydrotrend/waipaoa.hyps index de1da08..0c550a5 100644 --- a/meta/Hydrotrend/waipaoa.hyps +++ b/pymt_hydrotrend/data/Hydrotrend/waipaoa.hyps @@ -1,31 +1,31 @@ -------------------------------------------------- -Hypsometry input file for HYDROTREND -First line: number of hypsometric bins -Other lines: altitude (m) and area in (km^2) data -------------------------------------------------- -25 -1 208.9168081 -51 375.2451287 -101 536.0996727 -151 727.1589437 -201 902.604255 -251 1096.567651 -301 1257.078121 -351 1414.457889 -401 1529.215605 -451 1630.798354 -501 1704.457117 -551 1769.103192 -601 1816.557667 -651 1862.242091 -701 1898.728609 -751 1932.088621 -801 1954.393164 -851 1969.016904 -901 1977.0094 -951 1981.623038 -1001 1984.268222 -1051 1985.923785 -1101 1986.740178 -1151 1986.92 -1201 1986.921 +------------------------------------------------- +Hypsometry input file for HYDROTREND +First line: number of hypsometric bins +Other lines: altitude (m) and area in (km^2) data +------------------------------------------------- +25 +1 208.9168081 +51 375.2451287 +101 536.0996727 +151 727.1589437 +201 902.604255 +251 1096.567651 +301 1257.078121 +351 1414.457889 +401 1529.215605 +451 1630.798354 +501 1704.457117 +551 1769.103192 +601 1816.557667 +651 1862.242091 +701 1898.728609 +751 1932.088621 +801 1954.393164 +851 1969.016904 +901 1977.0094 +951 1981.623038 +1001 1984.268222 +1051 1985.923785 +1101 1986.740178 +1151 1986.92 +1201 1986.921 From 6abe4bfb32efbd0d6d821e06b7bbd164aca929cb Mon Sep 17 00:00:00 2001 From: mcflugen Date: Wed, 9 Oct 2019 13:42:36 -0600 Subject: [PATCH 2/4] add Windows search paths for library_dirs --- setup.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index cc0d5e0..0b988e5 100644 --- a/setup.py +++ b/setup.py @@ -8,20 +8,6 @@ from distutils.extension import Extension -try: - import model_metadata -except ImportError: - - def get_cmdclass(*args, **kwds): - return kwds.get("cmdclass", None) - - def get_entry_points(*args): - return None - - -else: - from model_metadata.utils import get_cmdclass, get_entry_points - import numpy as np @@ -33,6 +19,8 @@ def get_entry_points(*args): library_dirs = [] +if sys.platform.startswith("win"): + library_dirs.append(os.path.join(sys.prefix, "Library", "lib")) define_macros = [] @@ -58,7 +46,13 @@ def get_entry_points(*args): ] packages = find_packages() -pymt_components = [("Hydrotrend=pymt_hydrotrend.lib:Hydrotrend", "meta/Hydrotrend")] +entry_points = { + "pymt.plugins": [ + "Hydrotrend=pymt_hydrotrend.bmi:Hydrotrend", + ] +} + +cmdclass = versioneer.get_cmdclass() setup( name="pymt_hydrotrend", @@ -68,6 +62,7 @@ def get_entry_points(*args): setup_requires=["cython"], ext_modules=ext_modules, packages=packages, - cmdclass=get_cmdclass(pymt_components, cmdclass=versioneer.get_cmdclass()), - entry_points=get_entry_points(pymt_components), + cmdclass=cmdclass, + entry_points=entry_points, + include_package_data=True, ) From 3efdf03cd33a1624666058db6b00f54b4742c733 Mon Sep 17 00:00:00 2001 From: mcflugen Date: Wed, 9 Oct 2019 14:13:45 -0600 Subject: [PATCH 3/4] update usage of bmi-test --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5eaa198..8db01a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,4 @@ install: script: - python setup.py develop - python -c 'import pymt_hydrotrend' -- | - config_file=$(mmd-stage Hydrotrend . > MANIFEST && mmd-query Hydrotrend --var=run.config_file.path) - bmi-test pymt_hydrotrend.bmi:Hydrotrend --infile=$config_file --manifest=MANIFEST -v +- bmi-test pymt_hydrotrend.bmi:Hydrotrend -vvv From a6d68a8bd18d3df1e810afaf3f330279d5734deb Mon Sep 17 00:00:00 2001 From: mcflugen Date: Tue, 15 Oct 2019 10:26:44 -0600 Subject: [PATCH 4/4] add AppVeyor config file --- appveyor.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..6c3104e --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,37 @@ +environment: + + matrix: + - TARGET_ARCH: x64 + CONDA_INSTALL_LOCN: C:\\Miniconda37-x64 + CONDA_ENV: py37-windows + + - TARGET_ARCH: x64 + CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 + CONDA_ENV: py36-windows + +platform: + - x64 + +os: Previous Visual Studio 2015 + +init: + - "ECHO %CONDA_INSTALL_LOCN% %CONDA_PY% %HOME% %PLATFORM%" + - "ECHO %APPVEYOR_REPO_BRANCH%" + +install: + - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat + - cmd: conda update --yes --quiet conda + - cmd: set PYTHONUNBUFFERED=1 + - cmd: conda config --set always_yes yes + - cmd: conda config --append channels conda-forge + - cmd: conda env create -n test_env --file requirements.txt + - cmd: conda activate test_env + - cmd: conda install --quiet bmi-tester model_metadata + - cmd: python --version + - cmd: pip install -e . + +build: false + +test_script: + - python -c 'import pymt_hydrotrend' + - bmi-test pymt_hydrotrend.bmi:Hydrotrend -vvv