Remove store_folder and export_root attributes

src/fmu/dataio/_export_item.py

@@ -175,8 +175,6 @@ def __init__(
         self.iterfolder = dataio.iterfolder
         self.createfolder = dataio.createfolder
 
-        self.storefolder = self.dataio.runpath / self.dataio.export_root
-
         if subfolder is not None:
             warnings.warn(
                 "Exporting to a subfolder is a deviation from the standard "
@@ -888,7 +886,7 @@ def _construct_filename_fmustandard1(self):
         Returns stem for file name and destination
         """
         stem = "unset"
-        outroot = self.storefolder
+        outroot = self.dataio.runpath / "share" / "results"
         loc = self.efolder
 
         stem = self.name.lower()

src/fmu/dataio/dataio.py

@@ -151,9 +151,6 @@ class ExportData:
     grid_fformat = "roff"
     cube_fformat = "segy"
 
-    # this realization output which is relative to self._runpath!
-    export_root = "share/results"
-
     # this is case folder which is "outside runs" i.e. another relative!
     # e.g. /somepath/mycase/share/metadata
     case_folder = "share/metadata"

tests/test_fmu_dataio_generic.py

@@ -216,7 +216,6 @@ def test_file_block(tmp_path):
 
     shutil.copytree("tests/data/drogon/ertrun1", current / "mycase")
 
-    fmu.dataio.ExportData.export_root = "share/results"
     fmu.dataio.ExportData.surface_fformat = "irap_binary"
 
     runfolder = current / "mycase" / "realization-0" / "iter-0" / "rms" / "model"

tests/test_fmu_dataio_grids.py

@@ -104,7 +104,6 @@ def test_gridprop_io_larger_case(tmp_path):
     grdp = xtgeo.GridProperty(ncol=2, nrow=7, nlay=13)
     grdp.name = "poro"
 
-    fmu.dataio.ExportData.export_root = tmp_path.resolve()
     fmu.dataio.ExportData.grid_fformat = "roff"
 
     exp = fmu.dataio.ExportData(
@@ -139,7 +138,6 @@ def test_grid_io_larger_case_ertrun(tmp_path):
 
     shutil.copytree(CASEPATH, current / "mycase")
 
-    fmu.dataio.ExportData.export_root = "share/results"
     fmu.dataio.ExportData.surface_fformat = "roff"
 
     runfolder = current / "mycase" / "realization-0" / "iter-0" / "rms" / "model"
@@ -196,7 +194,6 @@ def test_gridprop_io_larger_case_ertrun(tmp_path):
 
     shutil.copytree(CASEPATH, current / "mycase")
 
-    fmu.dataio.ExportData.export_root = "share/results"
     fmu.dataio.ExportData.surface_fformat = "roff"
 
     runfolder = current / "mycase" / "realization-0" / "iter-0" / "rms" / "model"

tests/test_fmu_dataio_polygons.py

@@ -40,19 +40,19 @@
     (1.1, 2.0, 3.0, 2),
 ]
 CASEPATH = "tests/data/drogon/ertrun1"
+FMUP1 = "share/results"
 
 
 def test_polygons_io(tmp_path):
     """Minimal test polygons io, uses tmp_path."""
 
     srf = xtgeo.Polygons(POLY)
-    fmu.dataio.ExportData.export_root = tmp_path.resolve()
     fmu.dataio.ExportData.polygons_fformat = "csv"
 
-    exp = fmu.dataio.ExportData(name="test", content="depth", runfolder=tmp_path)
+    exp = fmu.dataio.ExportData(name="test", content="depth", runpath=tmp_path)
     exp.export(srf)
 
-    assert (tmp_path / "polygons" / ".test.csv.yml").is_file() is True
+    assert (tmp_path / FMUP1 / "polygons" / ".test.csv.yml").is_file() is True
 
 
 def test_polygons_io_larger_case_ertrun(tmp_path):
@@ -63,7 +63,6 @@ def test_polygons_io_larger_case_ertrun(tmp_path):
 
     shutil.copytree(CASEPATH, current / "mycase")
 
-    fmu.dataio.ExportData.export_root = "share/results"
     fmu.dataio.ExportData.polygons_fformat = "irap_ascii"
 
     runfolder = current / "mycase" / "realization-0" / "iter-0" / "rms" / "model"

tests/test_fmu_dataio_surface.py

@@ -41,14 +41,13 @@ def test_surface_io(tmp_path):
     srf = xtgeo.RegularSurface(
         ncol=20, nrow=30, xinc=20, yinc=20, values=np.ma.ones((20, 30)), name="test"
     )
-    fmu.dataio.ExportData.export_root = tmp_path.resolve()
     fmu.dataio.ExportData.surface_fformat = "irap_binary"
 
-    exp = fmu.dataio.ExportData(content="depth", runfolder=tmp_path)
+    exp = fmu.dataio.ExportData(content="depth", runpath=tmp_path)
     exp.export(srf)
 
-    assert (tmp_path / "maps" / "test.gri").is_file() is True
-    assert (tmp_path / "maps" / ".test.gri.yml").is_file() is True
+    assert (tmp_path / FMUP1 / "maps" / "test.gri").is_file() is True
+    assert (tmp_path / FMUP1 / "maps" / ".test.gri.yml").is_file() is True
 
 
 def test_surface_io_export_subfolder(tmp_path):
@@ -58,15 +57,16 @@ def test_surface_io_export_subfolder(tmp_path):
     srf = xtgeo.RegularSurface(
         ncol=20, nrow=30, xinc=20, yinc=20, values=np.ma.ones((20, 30)), name="test"
     )
-    fmu.dataio.ExportData.export_root = tmp_path.resolve()
     fmu.dataio.ExportData.surface_fformat = "irap_binary"
 
-    exp = fmu.dataio.ExportData(content="depth", runfolder=tmp_path)
+    exp = fmu.dataio.ExportData(content="depth", runpath=tmp_path)
     with pytest.warns(UserWarning):
         exp.export(srf, subfolder="mysubfolder")
 
-    assert (tmp_path / "maps" / "mysubfolder" / "test.gri").is_file() is True
-    assert (tmp_path / "maps" / "mysubfolder" / ".test.gri.yml").is_file() is True
+    assert (tmp_path / FMUP1 / "maps" / "mysubfolder" / "test.gri").is_file() is True
+    assert (
+        tmp_path / FMUP1 / "maps" / "mysubfolder" / ".test.gri.yml"
+    ).is_file() is True
 
 
 def test_surface_io_larger_case(tmp_path):
@@ -81,7 +81,6 @@ def test_surface_io_larger_case(tmp_path):
         values=np.ma.ones((20, 30)),
         name="TopVolantis",
     )
-    fmu.dataio.ExportData.export_root = tmp_path.resolve()
     fmu.dataio.ExportData.surface_fformat = "irap_binary"
 
     exp = fmu.dataio.ExportData(
@@ -114,7 +113,6 @@ def test_surface_io_larger_case_ertrun(tmp_path):
 
     shutil.copytree(CASEPATH, current / "mycase")
 
-    fmu.dataio.ExportData.export_root = "share/results"
     fmu.dataio.ExportData.surface_fformat = "irap_binary"
 
     runfolder = current / "mycase" / "realization-0" / "iter-0" / "rms" / "model"

tests/test_fmu_dataio_table.py

@@ -75,20 +75,19 @@ def test_table_io_arrow(tmp_path):
     # make a small pa.Table
     df = pd.DataFrame({"STOIIP": [123, 345, 654], "PORO": [0.2, 0.4, 0.3]})
     table = pa.Table.from_pandas(df)
-    fmu.dataio.ExportData.export_root = tmp_path.resolve()
 
     exp = fmu.dataio.ExportData(
-        name="test", verbosity="INFO", content="timeseries", runfolder=tmp_path
+        name="test", verbosity="INFO", content="timeseries", runpath=tmp_path
     )
     exp.export(table)
 
-    assert (tmp_path / "tables" / "test.arrow").is_file() is True
-    assert (tmp_path / "tables" / ".test.arrow.yml").is_file() is True
+    assert (tmp_path / FMUP1 / "tables" / "test.arrow").is_file() is True
+    assert (tmp_path / FMUP1 / "tables" / ".test.arrow.yml").is_file() is True
 
-    table_in = pa.feather.read_table(tmp_path / "tables" / "test.arrow")
+    table_in = pa.feather.read_table(tmp_path / FMUP1 / "tables" / "test.arrow")
     assert table_in.num_columns == 2
 
-    with open(tmp_path / "tables" / ".test.arrow.yml") as stream:
+    with open(tmp_path / FMUP1 / "tables" / ".test.arrow.yml") as stream:
         metadata = yaml.safe_load(stream)
         assert metadata["data"]["layout"] == "table"
         assert metadata["data"]["spec"]["size"] == 6
@@ -103,7 +102,6 @@ def test_tables_io_larger_case_ertrun(tmp_path):
     current.mkdir(parents=True, exist_ok=True)
     shutil.copytree(CASEPATH, current / "mycase")
 
-    fmu.dataio.ExportData.export_root = "share/results"
     fmu.dataio.ExportData.table_fformat = "csv"
 
     runfolder = current / "mycase" / "realization-0" / "iter-0" / "rms" / "model"