Swap name and tagname for grids

src/fmu/sumo/sim2sumo/common.py

@@ -49,15 +49,11 @@ def get_case_uuid(file_path, parent_level=4):
     Returns:
         str: the case uuid
     """
-    logger = logging.getLogger(__name__ + ".get_case_uuid")
-    logger.debug("Asked for parent %s for %s", parent_level, file_path)
     case_meta_path = (
         Path(file_path).parents[parent_level] / "share/metadata/fmu_case.yml"
     )
-    logger.debug("Case meta path: %s", case_meta_path)
     case_meta = yaml_load(case_meta_path)
     uuid = case_meta["fmu"]["case"]["uuid"]
-    logger.info("Case uuid: %s", uuid)
     return uuid
 
 
@@ -424,7 +420,7 @@ def find_datefield(text_string):
     return date
 
 
-def generate_meta(config, datafile_path, tagname, obj, content):
+def generate_meta(config, datafile_path, tagname, name, obj, content):
     """Generate metadata for object
 
     Args:
@@ -443,7 +439,6 @@ def generate_meta(config, datafile_path, tagname, obj, content):
     logger.debug("Config: %s", config)
     logger.debug("datafile_path: %s", datafile_path)
     logger.info("tagname: %s", tagname)
-    name = give_name(datafile_path)
     exp_args = {
         "config": config,
         "name": name,

src/fmu/sumo/sim2sumo/grid3d.py

@@ -18,10 +18,7 @@
 from xtgeo.grid3d import _gridprop_import_eclrun as eclrun
 from xtgeo.io._file import FileWrapper
 
-from .common import (
-    generate_meta,
-    convert_2_sumo_file,
-)
+from .common import generate_meta, convert_2_sumo_file, give_name
 
 
 def xtgeo_2_bytestring(obj):
@@ -64,10 +61,11 @@ def generate_grid3d_meta(datafile, obj, prefix, config, content):
         return obj
 
     if prefix == "grid":
-        tagname = prefix
+        name = prefix
     else:
-        tagname = f"{prefix}-{obj.name}"
-    metadata = generate_meta(config, datafile, tagname, obj, content)
+        name = f"{prefix}-{obj.name}"
+    tagname = give_name(datafile)
+    metadata = generate_meta(config, datafile, tagname, name, obj, content)
     logger.debug("Generated meta are %s", metadata)
 
     return metadata

src/fmu/sumo/sim2sumo/tables.py

@@ -22,10 +22,7 @@
     vfp_to_arrow_dict,
     find_md_log,
 )
-from .common import (
-    generate_meta,
-    convert_2_sumo_file,
-)
+from .common import generate_meta, convert_2_sumo_file, give_name
 
 
 SUBMOD_CONTENT = {
@@ -88,7 +85,8 @@ def generate_table_meta(datafile, obj, tagname, config):
     else:
         content = SUBMOD_CONTENT.get(tagname, "property")
 
-    metadata = generate_meta(config, datafile, tagname, obj, content)
+    name = give_name(datafile)
+    metadata = generate_meta(config, datafile, tagname, name, obj, content)
     logger.debug("Generated meta are %s", metadata)
 
     return metadata