diff --git a/src/fmu/sumo/sim2sumo/_special_treatments.py b/src/fmu/sumo/sim2sumo/_special_treatments.py index 3a6e2407..eeb48286 100644 --- a/src/fmu/sumo/sim2sumo/_special_treatments.py +++ b/src/fmu/sumo/sim2sumo/_special_treatments.py @@ -109,34 +109,11 @@ def _define_submodules(): return tuple(submodules.keys()), submodules -def find_md_log(submod, options): - """Search options for md_log_file - - Args: - submod (str): submodule - options (dict): the dictionary to check - - Returns: - str|None: whatever contained in md_log_file - """ - if submod != "rft": - return None - # Special treatment of argument md_log_file - md_log_file = options.get("md_log_file", None) - try: - del options["md_log_file"] - except KeyError: - pass # No md log provided - - return md_log_file - - -def complete_rft(frame, md_log_file): +def tidy(frame): """Utility function to tidy up mess from res2df for rft Args: frame (pd.DataFrame): the dataframe fixed with no WELLETC - md_log_file (str): file with md log file """ # res2df creates three files for rft data, see unwanted list below logger = logging.getLogger(__file__ + ".tidy") @@ -153,9 +130,6 @@ def complete_rft(frame, md_log_file): if "WELLETC" in frame.columns: frame.drop(["WELLETC"], axis=1, inplace=True) - if md_log_file is not None: - frame = add_md_to_rft(frame, md_log_file) - return frame @@ -187,35 +161,3 @@ def vfp_to_arrow_dict(datafile, options): resdatafiles.get_deck(), keyword=keyword, vfpnumbers_str=vfpnumbers ) return vfp_dict - - -def add_md_to_rft(rft_table, md_file_path): - """Merge md data with rft table - - Args: - rft_table (pd.DataFrame): the rft dataframe - md_file_path (str): path to file with md data - - Raises: - FileNotFoundError: if md_file_path does not point to existing file - - Returns: - pd.Dataframe: the merged results - """ - try: - md_table = pd.read_csv(md_file_path) - except FileNotFoundError as fnfe: - raise FileNotFoundError( - f"There is no md file called {md_file_path}" - ) from fnfe - - xtgeo_index_names = ["I_INDEX", "J_INDEX", "K_INDEX"] - rft_index_names = ["CONIPOS", "CONJPOS", "CONKPOS"] - # for grid indeces xtgeo starts from 0, res2df from 1 - md_table[xtgeo_index_names] += 1 - md_table[xtgeo_index_names] = md_table[xtgeo_index_names].astype(int) - xtgeo_to_rft_names = dict(zip(xtgeo_index_names, rft_index_names)) - md_table.rename(xtgeo_to_rft_names, axis=1, inplace=True) - rft_table = pd.merge(rft_table, md_table, on=rft_index_names, how="left") - - return rft_table diff --git a/src/fmu/sumo/sim2sumo/common.py b/src/fmu/sumo/sim2sumo/common.py index 08f9ea47..6f0b10aa 100644 --- a/src/fmu/sumo/sim2sumo/common.py +++ b/src/fmu/sumo/sim2sumo/common.py @@ -71,7 +71,7 @@ def filter_options(submod, kwargs): filtered = { key: value for key, value in kwargs.items() - if (key in submod_options) or key in ["arrow", "md_log_file"] + if (key in submod_options) or key == "arrow" } filtered["arrow"] = kwargs.get( "arrow", True diff --git a/src/fmu/sumo/sim2sumo/tables.py b/src/fmu/sumo/sim2sumo/tables.py index 5ebe11d0..ef6ecc8b 100644 --- a/src/fmu/sumo/sim2sumo/tables.py +++ b/src/fmu/sumo/sim2sumo/tables.py @@ -17,10 +17,9 @@ from ._special_treatments import ( SUBMOD_DICT, - complete_rft, + tidy, convert_to_arrow, vfp_to_arrow_dict, - find_md_log, ) from .common import generate_meta @@ -121,9 +120,6 @@ def get_table( except KeyError: pass # No arrow key to delete output = None - # TODO: see if there is a cleaner way with rft, see functions - # find_md_log, and complete_rft, but needs really to be fixed in res2df - md_log_file = find_md_log(submod, kwargs) try: logger.info( "Extracting data from %s with func %s for %s", @@ -136,7 +132,7 @@ def get_table( **kwargs, ) if submod == "rft": - output = complete_rft(output, md_log_file) + output = tidy(output) if arrow: try: convert_func = SUBMOD_DICT[submod]["arrow_convertor"] diff --git a/tests/conftest.py b/tests/conftest.py index 6560146c..c5d33fee 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -65,11 +65,6 @@ def _fix_rft_reek(): ) -@pytest.fixture(scope="session", name="drogonrft") -def _fix_rft_drogon(): - return pd.read_csv(Path(__file__).parent / "data/drogon/rft.csv") - - @pytest.fixture(scope="session", name="config") def _fix_config(): return yaml_load(CONFIG_PATH) diff --git a/tests/data/drogon/realization-0/iter-0/eclipse/model/DROGON-0.RFT b/tests/data/drogon/realization-0/iter-0/eclipse/model/DROGON-0.RFT deleted file mode 100644 index 934aed62..00000000 Binary files a/tests/data/drogon/realization-0/iter-0/eclipse/model/DROGON-0.RFT and /dev/null differ diff --git a/tests/data/drogon/realization-0/iter-0/rms/output/wells/blocked_md_and_zonelog.csv b/tests/data/drogon/realization-0/iter-0/rms/output/wells/blocked_md_and_zonelog.csv deleted file mode 100644 index b59ca1b5..00000000 --- a/tests/data/drogon/realization-0/iter-0/rms/output/wells/blocked_md_and_zonelog.csv +++ /dev/null @@ -1,116 +0,0 @@ -X_UTME,Y_UTMN,Z_TVDSS,I_INDEX,J_INDEX,K_INDEX,MD,WELLNAME,NR_OF_WELLS,zone_nr,zone_name -461058.6511230469,5933811.888305664,1641.0272216796875,21.0,29.0,0.0,1693.82763671875,RFT_55_33-A-2,1,0.0,Valysar -461058.7995605469,5933809.536010742,1642.825927734375,21.0,29.0,1.0,1695.6082763671875,RFT_55_33-A-2,1,0.0,Valysar -461058.9479980469,5933807.183837891,1644.62451171875,21.0,29.0,2.0,1697.39013671875,RFT_55_33-A-2,1,0.0,Valysar -461059.0964355469,5933804.831481934,1646.4232177734375,21.0,29.0,3.0,1699.1732177734375,RFT_55_33-A-2,1,0.0,Valysar -461059.2448730469,5933802.479248047,1648.221923828125,21.0,29.0,4.0,1700.9575805664062,RFT_55_33-A-2,1,0.0,Valysar -461059.3932495117,5933800.126953125,1650.020263671875,21.0,29.0,5.0,1702.7431640625,RFT_55_33-A-2,1,0.0,Valysar -461059.54162597656,5933797.774719238,1651.819091796875,21.0,29.0,6.0,1704.5300903320312,RFT_55_33-A-2,1,0.0,Valysar -461059.69006347656,5933795.422424316,1653.61767578125,21.0,29.0,7.0,1706.318359375,RFT_55_33-A-2,1,0.0,Valysar -461059.83850097656,5933793.0701293945,1655.4161376953125,21.0,29.0,8.0,1708.1079711914062,RFT_55_33-A-2,1,0.0,Valysar -461059.98693847656,5933790.717834473,1657.215087890625,21.0,29.0,9.0,1709.89892578125,RFT_55_33-A-2,1,0.0,Valysar -461060.15252685547,5933788.2099609375,1659.1339111328125,21.0,29.0,10.0,1711.7953491210938,RFT_55_33-A-2,1,1.0,Therys -461060.33544921875,5933785.546508789,1661.1729736328125,21.0,29.0,11.0,1713.7972412109375,RFT_55_33-A-2,1,1.0,Therys -461060.5183105469,5933782.883178711,1663.212158203125,21.0,29.0,12.0,1715.8003540039062,RFT_55_33-A-2,1,1.0,Therys -461060.701171875,5933780.219665527,1665.2513427734375,21.0,29.0,13.0,1717.8046875,RFT_55_33-A-2,1,1.0,Therys -461060.8840332031,5933777.556274414,1667.290283203125,21.0,29.0,14.0,1719.810302734375,RFT_55_33-A-2,1,1.0,Therys -461061.0668334961,5933774.892822266,1669.3294677734375,21.0,29.0,15.0,1721.8172607421875,RFT_55_33-A-2,1,1.0,Therys -461061.2497558594,5933772.229370117,1671.36865234375,21.0,29.0,16.0,1723.8255004882812,RFT_55_33-A-2,1,1.0,Therys -461061.40270996094,5933770.000488281,1673.074462890625,21.0,29.0,17.0,1724.89599609375,RFT_55_33-A-2,1,1.0,Therys -460992.94177246094,5933896.996337891,1674.516845703125,21.0,28.0,17.0,1725.8677978515625,RFT_55_33-A-2,1,1.0,Therys -460993.7091064453,5933894.94519043,1676.189697265625,21.0,28.0,27.0,1727.7047729492188,RFT_55_33-A-2,1,2.0,Volon -460994.52880859375,5933892.76574707,1677.9683837890625,21.0,28.0,28.0,1729.4130249023438,RFT_55_33-A-2,1,2.0,Volon -460995.34844970703,5933890.586364746,1679.7471923828125,21.0,28.0,29.0,1731.1229858398438,RFT_55_33-A-2,1,2.0,Volon -460996.1682128906,5933888.406982422,1681.5262451171875,21.0,28.0,30.0,1732.8345336914062,RFT_55_33-A-2,1,2.0,Volon -460996.98791503906,5933886.227600098,1683.3050537109375,21.0,28.0,31.0,1734.547607421875,RFT_55_33-A-2,1,2.0,Volon -462690.33197021484,5932862.500778198,1609.26123046875,27.0,40.0,0.0,1654.3543090820312,RFT_55_33-A-3,1,0.0,Valysar -462688.5051269531,5932859.617523193,1611.3314208984375,27.0,40.0,1.0,1656.1166381835938,RFT_55_33-A-3,1,0.0,Valysar -462686.67834472656,5932856.734313965,1613.4012451171875,27.0,40.0,2.0,1657.873291015625,RFT_55_33-A-3,1,0.0,Valysar -462684.85150146484,5932853.851074219,1615.471435546875,27.0,40.0,3.0,1659.6240844726562,RFT_55_33-A-3,1,0.0,Valysar -462683.0246582031,5932850.967849731,1617.541259765625,27.0,40.0,4.0,1661.3688354492188,RFT_55_33-A-3,1,0.0,Valysar -462681.1979370117,5932848.084640503,1619.6114501953125,27.0,40.0,5.0,1662.5084838867188,RFT_55_33-A-3,1,0.0,Valysar -462806.7490234375,5932916.672218323,1609.2811279296875,28.0,40.0,5.0,1663.399658203125,RFT_55_33-A-3,1,0.0,Valysar -462804.8515625,5932913.628135681,1611.3172607421875,28.0,40.0,6.0,1664.9205932617188,RFT_55_33-A-3,1,0.0,Valysar -462802.95404052734,5932910.584060669,1613.353759765625,28.0,40.0,7.0,1666.7149658203125,RFT_55_33-A-3,1,0.0,Valysar -462801.05657958984,5932907.539916992,1615.389892578125,28.0,40.0,8.0,1668.5039672851562,RFT_55_33-A-3,1,0.0,Valysar -462799.15911865234,5932904.495796204,1617.42626953125,28.0,40.0,9.0,1670.2880859375,RFT_55_33-A-3,1,0.0,Valysar -462797.1124267578,5932901.212104797,1619.6224365234375,28.0,40.0,10.0,1672.0399169921875,RFT_55_33-A-3,1,1.0,Therys -462794.9163208008,5932897.688819885,1621.97802734375,28.0,40.0,11.0,1673.7625122070312,RFT_55_33-A-3,1,1.0,Therys -462792.72033691406,5932894.16557312,1624.3338623046875,28.0,40.0,12.0,1675.4864501953125,RFT_55_33-A-3,1,1.0,Therys -462790.5242919922,5932890.642288208,1626.689697265625,28.0,40.0,13.0,1677.2117309570312,RFT_55_33-A-3,1,1.0,Therys -462788.32818603516,5932887.118919373,1629.045654296875,28.0,40.0,14.0,1678.9384155273438,RFT_55_33-A-3,1,1.0,Therys -462786.5249633789,5932884.226409912,1630.9835205078125,28.0,40.0,15.0,1680.6664428710938,RFT_55_33-A-3,1,1.0,Therys -462784.12731933594,5932880.38041687,1633.5594482421875,28.0,40.0,27.0,1684.2991333007812,RFT_55_33-A-3,1,2.0,Volon -462780.7424316406,5932874.95010376,1637.1912841796875,28.0,40.0,28.0,1687.4298095703125,RFT_55_33-A-3,1,2.0,Volon -462777.357421875,5932869.519790649,1640.8231201171875,28.0,40.0,29.0,1690.5574951171875,RFT_55_33-A-3,1,2.0,Volon -462773.9724121094,5932864.089492798,1644.455078125,28.0,40.0,30.0,1693.67822265625,RFT_55_33-A-3,1,2.0,Volon -462770.58752441406,5932858.659210205,1648.086669921875,28.0,40.0,31.0,1696.7880249023438,RFT_55_33-A-3,1,2.0,Volon -463760.07421875,5931605.940551758,1629.9342041015625,29.0,51.0,0.0,2243.13818359375,RFT_55_33-A-4,1,0.0,Valysar -463888.38525390625,5931681.442626953,1626.684814453125,30.0,51.0,0.0,2258.687255859375,RFT_55_33-A-4,1,0.0,Valysar -463887.6799316406,5931679.096069336,1628.4876708984375,30.0,51.0,1.0,2290.3897705078125,RFT_55_33-A-4,1,0.0,Valysar -463886.974609375,5931676.749755859,1630.29052734375,30.0,51.0,2.0,2339.4869384765625,RFT_55_33-A-4,1,0.0,Valysar -463886.2692871094,5931674.4033203125,1632.093505859375,30.0,51.0,3.0,2389.1220703125,RFT_55_33-A-4,1,0.0,Valysar -463885.56396484375,5931672.056762695,1633.896728515625,30.0,51.0,4.0,2415.624755859375,RFT_55_33-A-4,1,0.0,Valysar -464013.40087890625,5931745.338745117,1632.527587890625,31.0,51.0,4.0,2456.458984375,RFT_55_33-A-4,1,0.0,Valysar -463935.4606933594,5931862.987426758,1635.85546875,31.0,50.0,4.0,2536.7152099609375,RFT_55_33-A-4,1,0.0,Valysar -463936.13623046875,5931865.540771484,1634.2359619140625,31.0,50.0,3.0,2580.36474609375,RFT_55_33-A-4,1,0.0,Valysar -464062.77197265625,5931932.939941406,1635.6204833984375,32.0,50.0,3.0,2646.635986328125,RFT_55_33-A-4,1,0.0,Valysar -464062.0920410156,5931929.9658203125,1637.2899169921875,32.0,50.0,4.0,2723.151611328125,RFT_55_33-A-4,1,0.0,Valysar -463983.26611328125,5932040.467468262,1641.7808837890625,32.0,49.0,4.0,2739.6239013671875,RFT_55_33-A-4,1,0.0,Valysar -464111.5830078125,5932110.396484375,1640.83740234375,33.0,49.0,4.0,2763.1019287109375,RFT_55_33-A-4,1,0.0,Valysar -464112.23486328125,5932113.865539551,1639.0848388671875,33.0,49.0,3.0,2845.7508544921875,RFT_55_33-A-4,1,0.0,Valysar -464240.6140136719,5932182.414672852,1640.8310546875,34.0,49.0,3.0,2935.1256103515625,RFT_55_33-A-4,1,0.0,Valysar -464241.1140136719,5932186.076171875,1639.1160888671875,34.0,49.0,2.0,2970.6356201171875,RFT_55_33-A-4,1,0.0,Valysar -464164.35546875,5932297.607727051,1642.515625,34.0,48.0,2.0,3006.3817138671875,RFT_55_33-A-4,1,0.0,Valysar -464164.77490234375,5932300.809936523,1640.8917236328125,34.0,48.0,1.0,3055.9853515625,RFT_55_33-A-4,1,0.0,Valysar -464295.1044921875,5932378.869812012,1641.4276123046875,35.0,48.0,30.0,3161.878662109375,RFT_55_33-A-4,1,2.0,Volon -464220.99755859375,5932507.359863281,1638.9266357421875,35.0,47.0,30.0,3251.57080078125,RFT_55_33-A-4,1,2.0,Volon -464351.453125,5932584.098327637,1646.74267578125,36.0,47.0,30.0,3350.25341796875,RFT_55_33-A-4,1,2.0,Volon -464480.44287109375,5932661.806915283,1653.8497314453125,37.0,47.0,30.0,3487.3402099609375,RFT_55_33-A-4,1,2.0,Volon -464407.1103515625,5932791.058868408,1658.3720703125,37.0,46.0,30.0,3555.658447265625,RFT_55_33-A-4,1,2.0,Volon -461539.40295410156,5935726.059326172,1684.9752197265625,30.0,19.0,0.0,1732.4241333007812,RFT_55_33-A-5,1,0.0,Valysar -461533.9139251709,5935729.051025391,1687.26953125,30.0,19.0,1.0,1734.569580078125,RFT_55_33-A-5,1,0.0,Valysar -461528.4249572754,5935732.042480469,1689.56396484375,30.0,19.0,2.0,1736.7212524414062,RFT_55_33-A-5,1,0.0,Valysar -461522.9360046387,5935735.033691406,1691.8585205078125,30.0,19.0,3.0,1738.8797607421875,RFT_55_33-A-5,1,0.0,Valysar -461517.4469909668,5935738.025390625,1694.153076171875,30.0,19.0,4.0,1741.045654296875,RFT_55_33-A-5,1,0.0,Valysar -461511.9578552246,5935741.016845703,1696.4476318359375,30.0,19.0,5.0,1743.219482421875,RFT_55_33-A-5,1,0.0,Valysar -461506.46881103516,5935744.008300781,1698.7423095703125,30.0,19.0,6.0,1745.4017333984375,RFT_55_33-A-5,1,0.0,Valysar -461500.97985839844,5935746.999755859,1701.03662109375,30.0,19.0,7.0,1747.5928344726562,RFT_55_33-A-5,1,0.0,Valysar -461495.49084472656,5935749.9912109375,1703.3311767578125,30.0,19.0,8.0,1749.7933959960938,RFT_55_33-A-5,1,0.0,Valysar -461490.00186157227,5935752.982910156,1705.625732421875,30.0,19.0,9.0,1752.0038452148438,RFT_55_33-A-5,1,0.0,Valysar -461484.89642333984,5935755.765625,1707.7586669921875,30.0,19.0,10.0,1754.0565795898438,RFT_55_33-A-5,1,1.0,Therys -461480.1743774414,5935758.33984375,1709.730224609375,30.0,19.0,11.0,1755.2443237304688,RFT_55_33-A-5,1,1.0,Therys -461559.5185852051,5935626.2421875,1701.9884033203125,30.0,20.0,11.0,1756.14404296875,RFT_55_33-A-5,1,1.0,Therys -461555.1990966797,5935628.549316406,1703.9503173828125,30.0,20.0,12.0,1757.6829223632812,RFT_55_33-A-5,1,1.0,Therys -461550.8796081543,5935630.8564453125,1705.9122314453125,30.0,20.0,13.0,1759.4443359375,RFT_55_33-A-5,1,1.0,Therys -461546.5601043701,5935633.163574219,1707.8740234375,30.0,20.0,14.0,1761.2011108398438,RFT_55_33-A-5,1,1.0,Therys -461542.24057006836,5935635.470458984,1709.8359375,30.0,20.0,15.0,1762.953369140625,RFT_55_33-A-5,1,1.0,Therys -461537.9211578369,5935637.777587891,1711.7979736328125,30.0,20.0,16.0,1764.7013549804688,RFT_55_33-A-5,1,1.0,Therys -461534.1918640137,5935639.813720703,1713.5023193359375,30.0,20.0,17.0,1766.1707153320312,RFT_55_33-A-5,1,1.0,Therys -461529.54150390625,5935642.4404296875,1715.6741943359375,30.0,20.0,27.0,1767.7901611328125,RFT_55_33-A-5,1,2.0,Volon -461524.37368774414,5935645.228027344,1718.033935546875,30.0,20.0,28.0,1769.8418579101562,RFT_55_33-A-5,1,2.0,Volon -461519.2060546875,5935648.015380859,1720.3936767578125,30.0,20.0,29.0,1771.9052124023438,RFT_55_33-A-5,1,2.0,Volon -461514.038482666,5935650.802978516,1722.7532958984375,30.0,20.0,30.0,1773.9815063476562,RFT_55_33-A-5,1,2.0,Volon -461508.8706970215,5935653.590576172,1725.1131591796875,30.0,20.0,31.0,1776.0721435546875,RFT_55_33-A-5,1,2.0,Volon -461305.66845703125,5931866.953613281,1695.1890869140625,16.0,41.0,0.0,1743.6798095703125,RFT_55_33-A-6,1,0.0,Valysar -461305.7067871094,5931866.390258789,1696.7410888671875,16.0,41.0,1.0,1745.224365234375,RFT_55_33-A-6,1,0.0,Valysar -461305.7450866699,5931865.826904297,1698.29296875,16.0,41.0,2.0,1746.7691650390625,RFT_55_33-A-6,1,0.0,Valysar -461305.78341674805,5931865.263671875,1699.8448486328125,16.0,41.0,3.0,1748.3142700195312,RFT_55_33-A-6,1,0.0,Valysar -461305.82177734375,5931864.7001953125,1701.39697265625,16.0,41.0,4.0,1749.859619140625,RFT_55_33-A-6,1,0.0,Valysar -461305.8600769043,5931864.13684082,1702.9486083984375,16.0,41.0,5.0,1751.4051513671875,RFT_55_33-A-6,1,0.0,Valysar -461305.8984375,5931863.573486328,1704.5006103515625,16.0,41.0,6.0,1752.9510498046875,RFT_55_33-A-6,1,0.0,Valysar -461305.93670654297,5931863.010009766,1706.052490234375,16.0,41.0,7.0,1754.4971923828125,RFT_55_33-A-6,1,0.0,Valysar -461305.9750366211,5931862.446777344,1707.6043701171875,16.0,41.0,8.0,1756.0435791015625,RFT_55_33-A-6,1,0.0,Valysar -461306.0133972168,5931861.883422852,1709.15625,16.0,41.0,9.0,1757.5902709960938,RFT_55_33-A-6,1,0.0,Valysar -461306.06338500977,5931861.147216797,1711.1871337890625,16.0,41.0,10.0,1759.3560791015625,RFT_55_33-A-6,1,1.0,Therys -461306.12518310547,5931860.238647461,1713.6968994140625,16.0,41.0,11.0,1761.3408203125,RFT_55_33-A-6,1,1.0,Therys -461306.186920166,5931859.329833984,1716.20654296875,16.0,41.0,12.0,1763.3253784179688,RFT_55_33-A-6,1,1.0,Therys -461306.24865722656,5931858.421264648,1718.71630859375,16.0,41.0,13.0,1765.3098754882812,RFT_55_33-A-6,1,1.0,Therys -461306.3103942871,5931857.512573242,1721.22607421875,16.0,41.0,14.0,1767.2943115234375,RFT_55_33-A-6,1,1.0,Therys -461306.37216186523,5931856.603881836,1723.7357177734375,16.0,41.0,15.0,1769.2786865234375,RFT_55_33-A-6,1,1.0,Therys -461306.4328918457,5931855.791748047,1725.966064453125,16.0,41.0,16.0,1771.262939453125,RFT_55_33-A-6,1,1.0,Therys -461306.4836730957,5931855.120849609,1727.806396484375,16.0,41.0,27.0,1776.1760864257812,RFT_55_33-A-6,1,2.0,Volon -461306.52545166016,5931854.494873047,1729.5360107421875,16.0,41.0,28.0,1777.8870849609375,RFT_55_33-A-6,1,2.0,Volon -461306.56732177734,5931853.868652344,1731.265869140625,16.0,41.0,29.0,1779.5978393554688,RFT_55_33-A-6,1,2.0,Volon -461306.6091003418,5931853.242675781,1732.9954833984375,16.0,41.0,30.0,1781.3084106445312,RFT_55_33-A-6,1,2.0,Volon -461306.6509094238,5931852.616455078,1734.725341796875,16.0,41.0,31.0,1783.018798828125,RFT_55_33-A-6,1,2.0,Volon diff --git a/tests/data/drogon/rft.csv b/tests/data/drogon/rft.csv deleted file mode 100644 index 1d8d2acf..00000000 --- a/tests/data/drogon/rft.csv +++ /dev/null @@ -1,225 +0,0 @@ -SWAT,CONIDX,DRAWDOWN,CONIPOS,SGAS,CONKPOS,CONJPOS,PRESSURE,WELL,DEPTH,WELLMODEL,CONBPRES,DATE -0.05829467251896858,1,0,22,0.0,1,30,300.45684814453125,R_A2,1639.541015625,STANDARD,300.45684814453125,2018-01-01 -0.05896293744444847,2,0,22,0.0,2,30,300.5682373046875,R_A2,1641.20263671875,STANDARD,300.5682373046875,2018-01-01 -0.06336245685815811,3,0,22,0.0,3,30,300.6796569824219,R_A2,1642.8643798828125,STANDARD,300.6796569824219,2018-01-01 -0.07001165300607681,4,0,22,0.0,4,30,300.79107666015625,R_A2,1644.5260009765625,STANDARD,300.79107666015625,2018-01-01 -0.0737161710858345,5,0,22,0.0,5,30,300.90252685546875,R_A2,1646.187744140625,STANDARD,300.90252685546875,2018-01-01 -0.32033777236938477,6,0,22,0.0,6,30,301.0139465332031,R_A2,1647.8494873046875,STANDARD,301.0139465332031,2018-01-01 -0.8981332182884216,7,0,22,0.0,7,30,301.1253662109375,R_A2,1649.5111083984375,STANDARD,301.1253662109375,2018-01-01 -0.8971830606460571,8,0,22,0.0,8,30,301.23681640625,R_A2,1651.1728515625,STANDARD,301.23681640625,2018-01-01 -0.9044471383094788,9,0,22,0.0,9,30,301.3482360839844,R_A2,1652.83447265625,STANDARD,301.3482360839844,2018-01-01 -0.9181208610534668,10,0,22,0.0,10,30,301.4596862792969,R_A2,1654.4962158203125,STANDARD,301.4596862792969,2018-01-01 -0.08077261596918106,11,0,22,0.0,11,30,301.58453369140625,R_A2,1656.357666015625,STANDARD,301.58453369140625,2018-01-01 -0.31139978766441345,12,0,22,0.0,12,30,301.7227783203125,R_A2,1658.4188232421875,STANDARD,301.7227783203125,2018-01-01 -0.48186346888542175,13,0,22,0.0,13,30,301.86102294921875,R_A2,1660.47998046875,STANDARD,301.86102294921875,2018-01-01 -0.6846365332603455,14,0,22,0.0,14,30,301.999267578125,R_A2,1662.5411376953125,STANDARD,301.999267578125,2018-01-01 -0.9613574743270874,15,0,22,0.0,15,30,302.13751220703125,R_A2,1664.602294921875,STANDARD,302.13751220703125,2018-01-01 -1.0,16,0,22,0.0,15,29,302.6183166503906,R_A2,1671.77001953125,STANDARD,302.6183166503906,2018-01-01 -1.0,17,0,22,0.0,16,29,302.955078125,R_A2,1673.9871826171875,STANDARD,302.955078125,2018-01-01 -1.0,18,0,22,0.0,17,29,303.1596984863281,R_A2,1676.1463623046875,STANDARD,303.1596984863281,2018-01-01 -1.0,19,0,22,0.0,18,29,303.2919616699219,R_A2,1677.5423583984375,STANDARD,303.2919616699219,2018-01-01 -1.0,20,0,22,0.0,27,29,303.5570983886719,R_A2,1678.77099609375,STANDARD,303.5570983886719,2018-01-01 -1.0,21,0,22,0.0,28,29,303.7244873046875,R_A2,1680.5374755859375,STANDARD,303.7244873046875,2018-01-01 -1.0,22,0,22,0.0,29,29,303.8918762207031,R_A2,1682.303955078125,STANDARD,303.8918762207031,2018-01-01 -1.0,23,0,22,0.0,30,29,304.05926513671875,R_A2,1684.0704345703125,STANDARD,304.05926513671875,2018-01-01 -1.0,24,0,22,0.0,31,29,304.2266540527344,R_A2,1685.8369140625,STANDARD,304.2266540527344,2018-01-01 -0.6481541991233826,1,0,28,0.0,1,41,298.312255859375,R_A3,1607.546875,STANDARD,298.312255859375,2018-01-01 -0.28430548310279846,2,0,28,0.0,2,41,298.4408264160156,R_A3,1609.465576171875,STANDARD,298.4408264160156,2018-01-01 -0.20014576613903046,3,0,28,0.0,3,41,298.56939697265625,R_A3,1611.38427734375,STANDARD,298.56939697265625,2018-01-01 -0.20620428025722504,4,0,28,0.0,4,41,298.697998046875,R_A3,1613.302978515625,STANDARD,298.697998046875,2018-01-01 -0.6599107980728149,5,0,28,0.0,5,41,298.82659912109375,R_A3,1615.2216796875,STANDARD,298.82659912109375,2018-01-01 -0.8330202102661133,6,0,29,0.0,5,41,298.5881652832031,R_A3,1611.6640625,STANDARD,298.5881652832031,2018-01-01 -0.6481541991233826,7,0,29,0.0,6,41,298.7142639160156,R_A3,1613.5455322265625,STANDARD,298.7142639160156,2018-01-01 -0.20499372482299805,8,0,29,0.0,7,41,298.84033203125,R_A3,1615.4268798828125,STANDARD,298.84033203125,2018-01-01 -0.2068777233362198,9,0,29,0.0,8,41,298.9664306640625,R_A3,1617.3082275390625,STANDARD,298.9664306640625,2018-01-01 -0.26682916283607483,10,0,29,0.0,9,41,299.092529296875,R_A3,1619.1895751953125,STANDARD,299.092529296875,2018-01-01 -0.6481541991233826,11,0,29,0.0,10,41,299.2186279296875,R_A3,1621.0709228515625,STANDARD,299.2186279296875,2018-01-01 -0.05162348225712776,12,0,29,0.0,11,41,299.35980224609375,R_A3,1623.1768798828125,STANDARD,299.35980224609375,2018-01-01 -0.06007147580385208,13,0,29,0.0,12,41,299.5159912109375,R_A3,1625.50732421875,STANDARD,299.5159912109375,2018-01-01 -0.23008954524993896,14,0,29,0.0,13,41,299.6722106933594,R_A3,1627.8377685546875,STANDARD,299.6722106933594,2018-01-01 -0.37389346957206726,15,0,29,0.0,14,41,299.8284606933594,R_A3,1630.168212890625,STANDARD,299.8284606933594,2018-01-01 -0.8188477754592896,16,0,29,0.0,15,41,299.98101806640625,R_A3,1632.4439697265625,STANDARD,299.98101806640625,2018-01-01 -0.7754690647125244,17,0,29,0.0,16,41,300.0665588378906,R_A3,1633.7198486328125,STANDARD,300.0665588378906,2018-01-01 -0.25004661083221436,18,0,29,0.0,27,41,300.1861572265625,R_A3,1635.503662109375,STANDARD,300.1861572265625,2018-01-01 -0.049023620784282684,19,0,29,0.0,28,41,300.4031677246094,R_A3,1638.7406005859375,STANDARD,300.4031677246094,2018-01-01 -0.05436234548687935,20,0,29,0.0,29,41,300.6202087402344,R_A3,1641.9775390625,STANDARD,300.6202087402344,2018-01-01 -0.6481541991233826,21,0,29,0.0,30,41,300.8372497558594,R_A3,1645.2144775390625,STANDARD,300.8372497558594,2018-01-01 -0.06716477125883102,22,0,29,0.0,31,41,301.0543212890625,R_A3,1648.451416015625,STANDARD,301.0543212890625,2018-01-01 -0.053038306534290314,1,0,30,0.0,1,52,299.7880554199219,R_A4,1629.565673828125,STANDARD,299.7880554199219,2018-01-01 -0.050381992012262344,2,0,31,0.0,1,52,299.6363525390625,R_A4,1627.3026123046875,STANDARD,299.6363525390625,2018-01-01 -0.05418938398361206,3,0,31,0.0,2,52,299.7633972167969,R_A4,1629.1976318359375,STANDARD,299.7633972167969,2018-01-01 -0.05600085109472275,4,0,31,0.0,3,52,299.89044189453125,R_A4,1631.0926513671875,STANDARD,299.89044189453125,2018-01-01 -0.05844911187887192,5,0,31,0.0,4,52,300.0174865722656,R_A4,1632.98779296875,STANDARD,300.0174865722656,2018-01-01 -0.05685551464557648,6,0,32,0.0,4,52,299.8629455566406,R_A4,1630.6829833984375,STANDARD,299.8629455566406,2018-01-01 -0.05819441005587578,7,0,32,0.0,5,52,299.98211669921875,R_A4,1632.4605712890625,STANDARD,299.98211669921875,2018-01-01 -0.0642411932349205,8,0,32,0.0,5,51,300.4134216308594,R_A4,1638.8935546875,STANDARD,300.4134216308594,2018-01-01 -0.06264745444059372,9,0,32,0.0,4,51,300.3039855957031,R_A4,1637.2613525390625,STANDARD,300.3039855957031,2018-01-01 -0.05999774485826492,10,0,33,0.0,4,51,300.2773742675781,R_A4,1636.864501953125,STANDARD,300.2773742675781,2018-01-01 -0.05891606956720352,11,0,33,0.0,3,51,300.16351318359375,R_A4,1635.1658935546875,STANDARD,300.16351318359375,2018-01-01 -0.07198259234428406,12,0,33,0.0,4,50,300.9150695800781,R_A4,1646.375,STANDARD,300.9150695800781,2018-01-01 -0.06653048098087311,13,0,34,0.0,4,50,300.6202087402344,R_A4,1641.977783203125,STANDARD,300.6202087402344,2018-01-01 -0.06635459512472153,14,0,34,0.0,3,50,300.5025634765625,R_A4,1640.2230224609375,STANDARD,300.5025634765625,2018-01-01 -0.10066241025924683,15,0,35,0.0,3,50,300.3204040527344,R_A4,1637.5059814453125,STANDARD,300.3204040527344,2018-01-01 -0.11255990713834763,16,0,35,0.0,3,49,300.9354553222656,R_A4,1646.6787109375,STANDARD,300.9354553222656,2018-01-01 -0.254747599363327,17,0,35,0.0,2,49,300.8240661621094,R_A4,1645.017822265625,STANDARD,300.8240661621094,2018-01-01 -0.6481541991233826,18,0,36,0.0,30,49,300.55657958984375,R_A4,1641.02880859375,STANDARD,300.55657958984375,2018-01-01 -0.6481541991233826,19,0,36,0.0,30,48,300.7957458496094,R_A4,1644.595458984375,STANDARD,300.7957458496094,2018-01-01 -1.0,20,0,37,0.0,30,48,300.9947204589844,R_A4,1647.5625,STANDARD,300.9947204589844,2018-01-01 -1.0,21,0,38,0.0,30,48,301.18841552734375,R_A4,1650.4510498046875,STANDARD,301.18841552734375,2018-01-01 -0.13595004379749298,22,0,38,0.0,29,48,300.8314514160156,R_A4,1645.1280517578125,STANDARD,300.8314514160156,2018-01-01 -0.08975277096033096,23,0,38,0.0,29,47,301.8282165527344,R_A4,1659.990966796875,STANDARD,301.8282165527344,2018-01-01 -1.0,1,0,31,0.0,1,20,303.9877014160156,R_A5,1686.542236328125,STANDARD,303.9877014160156,2018-01-01 -1.0,2,0,31,0.0,2,20,304.1932373046875,R_A5,1688.7110595703125,STANDARD,304.1932373046875,2018-01-01 -1.0,3,0,31,0.0,3,20,304.3987731933594,R_A5,1690.8798828125,STANDARD,304.3987731933594,2018-01-01 -1.0,4,0,31,0.0,4,20,304.60430908203125,R_A5,1693.0487060546875,STANDARD,304.60430908203125,2018-01-01 -1.0,5,0,31,0.0,5,20,304.809814453125,R_A5,1695.217529296875,STANDARD,304.809814453125,2018-01-01 -1.0,6,0,31,0.0,6,20,305.3211364746094,R_A5,1697.3863525390625,STANDARD,305.3211364746094,2018-01-01 -1.0,7,0,31,0.0,7,20,305.52667236328125,R_A5,1699.55517578125,STANDARD,305.52667236328125,2018-01-01 -1.0,8,0,31,0.0,11,21,305.2337951660156,R_A5,1699.68994140625,STANDARD,305.2337951660156,2018-01-01 -1.0,9,0,31,0.0,12,21,305.4329833984375,R_A5,1701.791748046875,STANDARD,305.4329833984375,2018-01-01 -1.0,10,0,31,0.0,13,21,305.6441345214844,R_A5,1703.8936767578125,STANDARD,305.6441345214844,2018-01-01 -1.0,11,0,31,0.0,14,21,305.84332275390625,R_A5,1705.99560546875,STANDARD,305.84332275390625,2018-01-01 -1.0,12,0,31,0.0,15,21,306.18756103515625,R_A5,1708.097412109375,STANDARD,306.18756103515625,2018-01-01 -1.0,13,0,31,0.0,16,21,306.3867492675781,R_A5,1710.1993408203125,STANDARD,306.3867492675781,2018-01-01 -1.0,14,0,31,0.0,17,21,306.5673828125,R_A5,1712.10546875,STANDARD,306.5673828125,2018-01-01 -1.0,15,0,31,0.0,18,21,306.68011474609375,R_A5,1713.2947998046875,STANDARD,306.68011474609375,2018-01-01 -1.0,16,0,31,0.0,19,21,306.7333984375,R_A5,1713.8570556640625,STANDARD,306.7333984375,2018-01-01 -1.0,17,0,31,0.0,27,21,306.70294189453125,R_A5,1715.193359375,STANDARD,306.70294189453125,2018-01-01 -1.0,18,0,31,0.0,28,21,306.9129943847656,R_A5,1717.40966796875,STANDARD,306.9129943847656,2018-01-01 -1.0,19,0,31,0.0,29,21,307.4288330078125,R_A5,1719.6260986328125,STANDARD,307.4288330078125,2018-01-01 -1.0,20,0,31,0.0,30,21,307.638916015625,R_A5,1721.842529296875,STANDARD,307.638916015625,2018-01-01 -1.0,21,0,31,0.0,31,21,307.8489685058594,R_A5,1724.058837890625,STANDARD,307.8489685058594,2018-01-01 -1.0,1,0,17,0.0,1,42,304.6695556640625,R_A6,1693.7371826171875,STANDARD,304.6695556640625,2018-01-01 -1.0,2,0,17,0.0,2,42,305.12005615234375,R_A6,1695.2642822265625,STANDARD,305.12005615234375,2018-01-01 -1.0,3,0,17,0.0,3,42,305.2647705078125,R_A6,1696.791259765625,STANDARD,305.2647705078125,2018-01-01 -1.0,4,0,17,0.0,4,42,305.4094543457031,R_A6,1698.318359375,STANDARD,305.4094543457031,2018-01-01 -1.0,5,0,17,0.0,5,42,305.5541687011719,R_A6,1699.8453369140625,STANDARD,305.5541687011719,2018-01-01 -1.0,6,0,17,0.0,6,42,305.6988830566406,R_A6,1701.372314453125,STANDARD,305.6988830566406,2018-01-01 -1.0,7,0,17,0.0,7,42,305.5445556640625,R_A6,1702.8992919921875,STANDARD,305.5445556640625,2018-01-01 -1.0,8,0,17,0.0,8,42,305.68927001953125,R_A6,1704.42626953125,STANDARD,305.68927001953125,2018-01-01 -1.0,9,0,17,0.0,9,42,306.1330261230469,R_A6,1705.953369140625,STANDARD,306.1330261230469,2018-01-01 -1.0,10,0,17,0.0,10,42,305.9719543457031,R_A6,1707.4803466796875,STANDARD,305.9719543457031,2018-01-01 -1.0,11,0,17,0.0,11,42,306.16510009765625,R_A6,1709.5169677734375,STANDARD,306.16510009765625,2018-01-01 -1.0,12,0,17,0.0,12,42,306.4183654785156,R_A6,1712.06298828125,STANDARD,306.4183654785156,2018-01-01 -1.0,13,0,17,0.0,13,42,306.6596374511719,R_A6,1714.6090087890625,STANDARD,306.6596374511719,2018-01-01 -1.0,14,0,17,0.0,14,42,306.90093994140625,R_A6,1717.155029296875,STANDARD,306.90093994140625,2018-01-01 -1.0,15,0,17,0.0,15,42,307.2872619628906,R_A6,1719.7010498046875,STANDARD,307.2872619628906,2018-01-01 -1.0,16,0,17,0.0,16,42,307.528564453125,R_A6,1722.2470703125,STANDARD,307.528564453125,2018-01-01 -1.0,17,0,17,0.0,17,42,307.7178955078125,R_A6,1724.244873046875,STANDARD,307.7178955078125,2018-01-01 -1.0,18,0,17,0.0,27,42,308.01611328125,R_A6,1725.822265625,STANDARD,308.01611328125,2018-01-01 -1.0,19,0,17,0.0,28,42,308.177734375,R_A6,1727.5277099609375,STANDARD,308.177734375,2018-01-01 -1.0,20,0,17,0.0,29,42,308.33935546875,R_A6,1729.233154296875,STANDARD,308.33935546875,2018-01-01 -1.0,21,0,17,0.0,30,42,308.5010070800781,R_A6,1730.9384765625,STANDARD,308.5010070800781,2018-01-01 -1.0,22,0,17,0.0,31,42,308.35687255859375,R_A6,1732.6439208984375,STANDARD,308.35687255859375,2018-01-01 -0.058313071727752686,1,0,22,0.0,1,30,297.13323974609375,R_A2,1639.541015625,STANDARD,297.13323974609375,2018-03-01 -0.05898040905594826,2,0,22,0.0,2,30,297.24456787109375,R_A2,1641.20263671875,STANDARD,297.24456787109375,2018-03-01 -0.06338929384946823,3,0,22,0.0,3,30,297.35589599609375,R_A2,1642.8643798828125,STANDARD,297.35589599609375,2018-03-01 -0.07005966454744339,4,0,22,0.0,4,30,297.46722412109375,R_A2,1644.5260009765625,STANDARD,297.46722412109375,2018-03-01 -0.07389593124389648,5,0,22,0.0,5,30,297.5785827636719,R_A2,1646.187744140625,STANDARD,297.5785827636719,2018-03-01 -0.3208107352256775,6,0,22,0.0,6,30,297.7525939941406,R_A2,1647.8494873046875,STANDARD,297.7525939941406,2018-03-01 -0.8979910612106323,7,0,22,0.0,7,30,297.8739013671875,R_A2,1649.5111083984375,STANDARD,297.8739013671875,2018-03-01 -0.8970811367034912,8,0,22,0.0,8,30,297.9921875,R_A2,1651.1728515625,STANDARD,297.9921875,2018-03-01 -0.9043525457382202,9,0,22,0.0,9,30,298.10821533203125,R_A2,1652.83447265625,STANDARD,298.10821533203125,2018-03-01 -0.9178423285484314,10,0,22,0.0,10,30,298.3410949707031,R_A2,1654.4962158203125,STANDARD,298.3410949707031,2018-03-01 -0.08079750090837479,11,0,22,0.0,11,30,298.8486328125,R_A2,1656.357666015625,STANDARD,298.8486328125,2018-03-01 -0.3116450905799866,12,0,22,0.0,12,30,298.9871826171875,R_A2,1658.4188232421875,STANDARD,298.9871826171875,2018-03-01 -0.48308077454566956,13,0,22,0.0,13,30,299.1267395019531,R_A2,1660.47998046875,STANDARD,299.1267395019531,2018-03-01 -0.6845545172691345,14,0,22,0.0,14,30,299.2768249511719,R_A2,1662.5411376953125,STANDARD,299.2768249511719,2018-03-01 -0.9613253474235535,15,0,22,0.0,15,30,299.4161682128906,R_A2,1664.602294921875,STANDARD,299.4161682128906,2018-03-01 -0.9999999403953552,16,0,22,-7.204396190729767e-09,15,29,299.93377685546875,R_A2,1671.77001953125,STANDARD,299.93377685546875,2018-03-01 -0.9999998807907104,17,0,22,-1.0269769035176068e-08,16,29,300.27032470703125,R_A2,1673.9871826171875,STANDARD,300.27032470703125,2018-03-01 -1.0,18,0,22,-1.3083871763797106e-09,17,29,300.475341796875,R_A2,1676.1463623046875,STANDARD,300.475341796875,2018-03-01 -1.0,19,0,22,-2.682951194543648e-09,18,29,300.6077575683594,R_A2,1677.5423583984375,STANDARD,300.6077575683594,2018-03-01 -1.0,20,0,22,-2.2450912255850344e-19,27,29,303.2852478027344,R_A2,1678.77099609375,STANDARD,303.2852478027344,2018-03-01 -1.0,21,0,22,-2.113404863704288e-21,28,29,303.27777099609375,R_A2,1680.5374755859375,STANDARD,303.27777099609375,2018-03-01 -1.0,22,0,22,-1.9592999038953085e-20,29,29,302.9219970703125,R_A2,1682.303955078125,STANDARD,302.9219970703125,2018-03-01 -1.0,23,0,22,-1.0985657502321815e-18,30,29,302.3253173828125,R_A2,1684.0704345703125,STANDARD,302.3253173828125,2018-03-01 -1.0,24,0,22,-7.20998356988469e-23,31,29,303.26336669921875,R_A2,1685.8369140625,STANDARD,303.26336669921875,2018-03-01 -1.0,1,0,31,0.0,1,20,282.157958984375,R_A5,1686.542236328125,STANDARD,282.157958984375,2018-04-28 -1.0,2,0,31,0.0,2,20,282.3633117675781,R_A5,1688.7110595703125,STANDARD,282.3633117675781,2018-04-28 -1.0,3,0,31,0.0,3,20,282.5686340332031,R_A5,1690.8798828125,STANDARD,282.5686340332031,2018-04-28 -1.0,4,0,31,0.0,4,20,282.77398681640625,R_A5,1693.0487060546875,STANDARD,282.77398681640625,2018-04-28 -1.0,5,0,31,0.0,5,20,282.9793701171875,R_A5,1695.217529296875,STANDARD,282.9793701171875,2018-04-28 -1.0,6,0,31,0.0,6,20,283.4905090332031,R_A5,1697.3863525390625,STANDARD,283.4905090332031,2018-04-28 -1.0,7,0,31,0.0,7,20,283.7146301269531,R_A5,1699.55517578125,STANDARD,283.7146301269531,2018-04-28 -1.0,8,0,31,0.0,11,21,276.9654235839844,R_A5,1699.68994140625,STANDARD,276.9654235839844,2018-04-28 -1.0,9,0,31,0.0,12,21,277.2974853515625,R_A5,1701.791748046875,STANDARD,277.2974853515625,2018-04-28 -1.0,10,0,31,0.0,13,21,277.5141906738281,R_A5,1703.8936767578125,STANDARD,277.5141906738281,2018-04-28 -1.0,11,0,31,0.0,14,21,277.7237854003906,R_A5,1705.99560546875,STANDARD,277.7237854003906,2018-04-28 -1.0,12,0,31,0.0,15,21,278.1725158691406,R_A5,1708.097412109375,STANDARD,278.1725158691406,2018-04-28 -1.0,13,0,31,0.0,16,21,278.68060302734375,R_A5,1710.1993408203125,STANDARD,278.68060302734375,2018-04-28 -1.0,14,0,31,0.0,17,21,279.1846923828125,R_A5,1712.10546875,STANDARD,279.1846923828125,2018-04-28 -1.0,15,0,31,0.0,18,21,279.4410095214844,R_A5,1713.2947998046875,STANDARD,279.4410095214844,2018-04-28 -1.0,16,0,31,0.0,19,21,279.5498352050781,R_A5,1713.8570556640625,STANDARD,279.5498352050781,2018-04-28 -1.0,17,0,31,0.0,27,21,283.5572814941406,R_A5,1715.193359375,STANDARD,283.5572814941406,2018-04-28 -1.0,18,0,31,0.0,28,21,283.7672424316406,R_A5,1717.40966796875,STANDARD,283.7672424316406,2018-04-28 -1.0,19,0,31,0.0,29,21,290.23321533203125,R_A5,1719.6260986328125,STANDARD,290.23321533203125,2018-04-28 -1.0,20,0,31,0.0,30,21,287.1640930175781,R_A5,1721.842529296875,STANDARD,287.1640930175781,2018-04-28 -1.0,21,0,31,0.0,31,21,296.3491516113281,R_A5,1724.058837890625,STANDARD,296.3491516113281,2018-04-28 -0.6497741341590881,1,0,28,0.0,1,41,276.8990783691406,R_A3,1607.546875,STANDARD,276.8990783691406,2018-07-03 -0.28491872549057007,2,0,28,0.0,2,41,277.02459716796875,R_A3,1609.465576171875,STANDARD,277.02459716796875,2018-07-03 -0.2006358504295349,3,0,28,0.0,3,41,277.1521301269531,R_A3,1611.38427734375,STANDARD,277.1521301269531,2018-07-03 -0.2066449373960495,4,0,28,0.0,4,41,277.2797546386719,R_A3,1613.302978515625,STANDARD,277.2797546386719,2018-07-03 -0.6614609956741333,5,0,28,0.0,5,41,277.3812561035156,R_A3,1615.2216796875,STANDARD,277.3812561035156,2018-07-03 -0.8315234780311584,6,0,29,0.0,5,41,277.1464538574219,R_A3,1611.6640625,STANDARD,277.1464538574219,2018-07-03 -0.6507773995399475,7,0,29,0.0,6,41,277.20489501953125,R_A3,1613.5455322265625,STANDARD,277.20489501953125,2018-07-03 -0.2054106742143631,8,0,29,0.0,7,41,277.3338623046875,R_A3,1615.4268798828125,STANDARD,277.3338623046875,2018-07-03 -0.20723268389701843,9,0,29,0.0,8,41,277.4593505859375,R_A3,1617.3082275390625,STANDARD,277.4593505859375,2018-07-03 -0.2667124569416046,10,0,29,0.0,9,41,277.5848083496094,R_A3,1619.1895751953125,STANDARD,277.5848083496094,2018-07-03 -0.6495441794395447,11,0,29,0.0,10,41,277.7159118652344,R_A3,1621.0709228515625,STANDARD,277.7159118652344,2018-07-03 -0.051626745611429214,12,0,29,0.0,11,41,298.7362365722656,R_A3,1623.1768798828125,STANDARD,298.7362365722656,2018-07-03 -0.060075003653764725,13,0,29,0.0,12,41,298.8924255371094,R_A3,1625.50732421875,STANDARD,298.8924255371094,2018-07-03 -0.2301044911146164,14,0,29,0.0,13,41,299.0486145019531,R_A3,1627.8377685546875,STANDARD,299.0486145019531,2018-07-03 -0.3739470839500427,15,0,29,0.0,14,41,299.2123107910156,R_A3,1630.168212890625,STANDARD,299.2123107910156,2018-07-03 -0.8188140988349915,16,0,29,0.0,15,41,299.3721008300781,R_A3,1632.4439697265625,STANDARD,299.3721008300781,2018-07-03 -0.7754424214363098,17,0,29,0.0,16,41,299.45745849609375,R_A3,1633.7198486328125,STANDARD,299.45745849609375,2018-07-03 -0.25093215703964233,18,0,29,0.0,27,41,283.18487548828125,R_A3,1635.503662109375,STANDARD,283.18487548828125,2018-07-03 -0.04911617934703827,19,0,29,0.0,28,41,283.40264892578125,R_A3,1638.7406005859375,STANDARD,283.40264892578125,2018-07-03 -0.05450913682579994,20,0,29,0.0,29,41,283.6187744140625,R_A3,1641.9775390625,STANDARD,283.6187744140625,2018-07-03 -0.6496753096580505,21,0,29,0.0,30,41,283.8602600097656,R_A3,1645.2144775390625,STANDARD,283.8602600097656,2018-07-03 -0.06731607019901276,22,0,29,0.0,31,41,284.06854248046875,R_A3,1648.451416015625,STANDARD,284.06854248046875,2018-07-03 -0.05315512418746948,1,0,30,0.0,1,52,277.4708251953125,R_A4,1629.565673828125,STANDARD,277.4708251953125,2018-09-12 -0.050534311681985855,2,0,31,0.0,1,52,277.4800720214844,R_A4,1627.3026123046875,STANDARD,277.4800720214844,2018-09-12 -0.05440639704465866,3,0,31,0.0,2,52,277.6064453125,R_A4,1629.1976318359375,STANDARD,277.6064453125,2018-09-12 -0.05651918053627014,4,0,31,0.0,3,52,277.7327880859375,R_A4,1631.0926513671875,STANDARD,277.7327880859375,2018-09-12 -0.05961348116397858,5,0,31,0.0,4,52,277.8591613769531,R_A4,1632.98779296875,STANDARD,277.8591613769531,2018-09-12 -0.058761704713106155,6,0,32,0.0,4,52,277.8562927246094,R_A4,1630.6829833984375,STANDARD,277.8562927246094,2018-09-12 -0.06240474432706833,7,0,32,0.0,5,52,277.97479248046875,R_A4,1632.4605712890625,STANDARD,277.97479248046875,2018-09-12 -0.0676933228969574,8,0,32,0.0,5,51,278.290283203125,R_A4,1638.8935546875,STANDARD,278.290283203125,2018-09-12 -0.06421858817338943,9,0,32,0.0,4,51,278.1815185546875,R_A4,1637.2613525390625,STANDARD,278.1815185546875,2018-09-12 -0.060180459171533585,10,0,33,0.0,4,51,278.3204040527344,R_A4,1636.864501953125,STANDARD,278.3204040527344,2018-09-12 -0.05905303731560707,11,0,33,0.0,3,51,278.2071533203125,R_A4,1635.1658935546875,STANDARD,278.2071533203125,2018-09-12 -0.07259347289800644,12,0,33,0.0,4,50,278.8524475097656,R_A4,1646.375,STANDARD,278.8524475097656,2018-09-12 -0.06668591499328613,13,0,34,0.0,4,50,278.6907958984375,R_A4,1641.977783203125,STANDARD,278.6907958984375,2018-09-12 -0.06654078513383865,14,0,34,0.0,3,50,278.5738220214844,R_A4,1640.2230224609375,STANDARD,278.5738220214844,2018-09-12 -0.10089361667633057,15,0,35,0.0,3,50,278.5081787109375,R_A4,1637.5059814453125,STANDARD,278.5081787109375,2018-09-12 -0.11273646354675293,16,0,35,0.0,3,49,278.977783203125,R_A4,1646.6787109375,STANDARD,278.977783203125,2018-09-12 -0.2549809217453003,17,0,35,0.0,2,49,278.8680419921875,R_A4,1645.017822265625,STANDARD,278.8680419921875,2018-09-12 -0.6497249603271484,18,0,36,0.0,30,49,278.88702392578125,R_A4,1641.02880859375,STANDARD,278.88702392578125,2018-09-12 -0.6497235298156738,19,0,36,0.0,30,48,278.8834533691406,R_A4,1644.595458984375,STANDARD,278.8834533691406,2018-09-12 -1.0,20,0,37,3.3794803977818533e-13,30,48,282.0754699707031,R_A4,1647.5625,STANDARD,282.0754699707031,2018-09-12 -1.0,21,0,38,3.985724036513656e-14,30,48,282.10089111328125,R_A4,1650.4510498046875,STANDARD,282.10089111328125,2018-09-12 -0.13575102388858795,22,0,38,0.0,29,48,279.4854431152344,R_A4,1645.1280517578125,STANDARD,279.4854431152344,2018-09-12 -0.0919070914387703,23,0,38,0.0,29,47,280.37213134765625,R_A4,1659.990966796875,STANDARD,280.37213134765625,2018-09-12 -1.0,1,0,17,-1.1004192349006736e-11,1,42,275.1885681152344,R_A6,1693.7371826171875,STANDARD,275.1885681152344,2018-11-07 -1.0,2,0,17,-1.8144360796820691e-12,2,42,275.6393127441406,R_A6,1695.2642822265625,STANDARD,275.6393127441406,2018-11-07 -1.0,3,0,17,-4.933288478246867e-13,3,42,275.7851257324219,R_A6,1696.791259765625,STANDARD,275.7851257324219,2018-11-07 -1.0,4,0,17,-2.3665390732675352e-14,4,42,275.9732666015625,R_A6,1698.318359375,STANDARD,275.9732666015625,2018-11-07 -1.0,5,0,17,-1.840266491710124e-14,5,42,276.1925964355469,R_A6,1699.8453369140625,STANDARD,276.1925964355469,2018-11-07 -1.0,6,0,17,-1.9284593927716524e-14,6,42,276.3818664550781,R_A6,1701.372314453125,STANDARD,276.3818664550781,2018-11-07 -1.0,7,0,17,-1.614833348420261e-13,7,42,276.23876953125,R_A6,1702.8992919921875,STANDARD,276.23876953125,2018-11-07 -1.0,8,0,17,-1.207262236143855e-13,8,42,276.3874206542969,R_A6,1704.42626953125,STANDARD,276.3874206542969,2018-11-07 -1.0,9,0,17,-1.9589263208514424e-14,9,42,276.8392333984375,R_A6,1705.953369140625,STANDARD,276.8392333984375,2018-11-07 -1.0,10,0,17,-3.715159775007299e-15,10,42,276.7039489746094,R_A6,1707.4803466796875,STANDARD,276.7039489746094,2018-11-07 -1.0,11,0,17,-2.9952984537118255e-10,11,42,278.0473327636719,R_A6,1709.5169677734375,STANDARD,278.0473327636719,2018-11-07 -1.0,12,0,17,-1.0309054304658005e-10,12,42,278.3004455566406,R_A6,1712.06298828125,STANDARD,278.3004455566406,2018-11-07 -1.0,13,0,17,-9.933808983730863e-12,13,42,278.5417785644531,R_A6,1714.6090087890625,STANDARD,278.5417785644531,2018-11-07 -1.0,14,0,17,-4.537240375079854e-12,14,42,278.7839660644531,R_A6,1717.155029296875,STANDARD,278.7839660644531,2018-11-07 -1.0,15,0,17,-4.840698154817691e-13,15,42,279.1763000488281,R_A6,1719.7010498046875,STANDARD,279.1763000488281,2018-11-07 -1.0,16,0,17,-1.4286770551319439e-12,16,42,279.4248046875,R_A6,1722.2470703125,STANDARD,279.4248046875,2018-11-07 -1.0,17,0,17,-1.2088244359491351e-13,17,42,279.6168212890625,R_A6,1724.244873046875,STANDARD,279.6168212890625,2018-11-07 -1.0,18,0,17,5.454558661094713e-17,27,42,280.2302551269531,R_A6,1725.822265625,STANDARD,280.2302551269531,2018-11-07 -1.0,19,0,17,2.2025606176967935e-17,28,42,280.40240478515625,R_A6,1727.5277099609375,STANDARD,280.40240478515625,2018-11-07 -1.0,20,0,17,6.223220960239105e-18,29,42,281.30804443359375,R_A6,1729.233154296875,STANDARD,281.30804443359375,2018-11-07 -1.0,21,0,17,2.3760124615550406e-19,30,42,281.6570129394531,R_A6,1730.9384765625,STANDARD,281.6570129394531,2018-11-07 -1.0,22,0,17,-2.3710127286004357e-13,31,42,280.6692810058594,R_A6,1732.6439208984375,STANDARD,280.6692810058594,2018-11-07 diff --git a/tests/test_functions.py b/tests/test_functions.py index f99f7307..c0ece172 100644 --- a/tests/test_functions.py +++ b/tests/test_functions.py @@ -84,18 +84,17 @@ def check_expected_exports(expected_exports, shared_grid, prefix): @pytest.mark.parametrize( - "submod,options", + "submod,options,expected", [ - ("summary", {"arrow": True}), - ("rft", {"md_log_file": "badabing"}), - ("vfp", {}), + ("summary", {"arrow": True}, {"arrow": True}), + ("vfp", {}, {"arrow": True}), ], ) -def test_non_standard_filter_options(submod, options): +def test_non_standard_filter_options(submod, options, expected): returned_options = filter_options(submod, options) assert ( len(returned_options) > 0 - ), f"No options left for {submod}, should still be {options}" + ), f"No options left for {submod}, should be {expected}" @pytest.mark.parametrize( diff --git a/tests/test_w_drogon.py b/tests/test_w_drogon.py index 62570949..d61c890f 100644 --- a/tests/test_w_drogon.py +++ b/tests/test_w_drogon.py @@ -1,8 +1,5 @@ from pathlib import Path -from fmu.sumo.sim2sumo._special_treatments import ( - vfp_to_arrow_dict, - add_md_to_rft, -) +from fmu.sumo.sim2sumo._special_treatments import vfp_to_arrow_dict from fmu.sumo.sim2sumo.tables import ( upload_vfp_tables_from_simulation_run, get_table, @@ -49,19 +46,3 @@ def test_vfp_tables_from_simulation_run( upload_vfp_tables_from_simulation_run(DROGON_DATAFILE, {}, config, disp) disp.finish() check_sumo(case_uuid, "vfp", 5, "table", sumo) - - -def test_add_md_to_rft(drogonrft): - merged_rft = add_md_to_rft( - drogonrft, DROGON_REAL / "rms/output/wells/blocked_md_and_zonelog.csv" - ) - - assert merged_rft.dropna().shape[0] > 0, "No rows left after merge" - - -def test_get_rft_table_w_md_log(): - MD_LOG_FILE = DROGON_REAL / "rms/output/wells/blocked_md_and_zonelog.csv" - table = get_table(DROGON_DATAFILE, "rft", md_log_file=MD_LOG_FILE) - assert ( - table.shape[1] == 21 - ), "Don't have 21 columns as expected when merging with md log"