NDSL Issue#64: Use from_yaml_dict instead of from_f90nml in GEOS wrapper

pyfv3/_config.py

@@ -388,28 +388,32 @@ def from_namelist(cls, namelist: Namelist) -> "DynamicalCoreConfig":
 
     @classmethod
     def from_yaml(cls, yaml_config: str) -> "DynamicalCoreConfig":
-        config = cls()
         with open(yaml_config, "r") as f:
-            raw_config = yaml.safe_load(f)
+            yaml_dict = yaml.safe_load(f)
+        return cls.from_yaml_dict(yaml_dict)
+
+    @classmethod
+    def from_yaml_dict(cls, yaml_dict: dict) -> "DynamicalCoreConfig":
+        config = cls()
         flat_config: dict = {}
-        timestep = timedelta(seconds=raw_config["dt_atmos"])
+        timestep = timedelta(seconds=yaml_dict["dt_atmos"])
         runtime = {
             "days": 0.0,
             "hours": 0.0,
             "minutes": 0.0,
             "seconds": 0.0,
         }
         for key in runtime.keys():
-            if key in raw_config.keys():
-                runtime[key] = raw_config[key]
+            if key in yaml_dict.keys():
+                runtime[key] = yaml_dict[key]
 
         total_time = timedelta(
             days=runtime["days"],
             hours=runtime["hours"],
             minutes=runtime["minutes"],
             seconds=runtime["seconds"],
         )
-        for key, value in raw_config.items():
+        for key, value in yaml_dict.items():
             if isinstance(value, dict):
                 for subkey, subvalue in value.items():
                     if subkey in config.__annotations__.keys():

pyfv3/wrappers/geos_wrapper.py

@@ -116,7 +116,7 @@ def __init__(
 
         self.backend = backend
         self.namelist = namelist
-        self.dycore_config = pyfv3.DynamicalCoreConfig.from_f90nml(self.namelist)
+        self.dycore_config = pyfv3.DynamicalCoreConfig.from_yaml_dict(self.namelist)
         self.dycore_config.dt_atmos = bdt
         assert self.dycore_config.dt_atmos != 0