Tmp dacite.Config for PhysicsConfig + PyFV3 module update + Clean-up

pace/driver.py

@@ -238,29 +238,26 @@ def from_dict(cls, kwargs: Dict[str, Any]) -> "DriverConfig":
                         f"you cannot set {derived_name} directly in dycore_config, "
                         "as it is determined based on top-level configuration"
                     )
+            kwargs["dycore_config"] = DynamicalCoreConfig.from_dict(
+                kwargs.get("dycore_config", {})
+            )
 
-            # TODO - After pyFV3 PR #88, replace dycore dacite cmd with:
-            # kwargs["dycore_config"] = DynamicalCoreConfig.from_dict(
-            #     kwargs.get("dycore_config", {})
+        if isinstance(kwargs["physics_config"], dict):
+            # TODO - After pySHiELD PR #68, replace physics dacite cmd with:
+            # kwargs["physics_config"] = PhysicsConfig.from_dict(
+            #     kwargs.get("physics_config", {})
             # )
-            dycore_dacite_config = dacite.Config(
+            phys_dacite_config = dacite.Config(
                 strict=True,
                 type_hooks={
                     Tuple[int, int]: lambda x: tuple(x),
                     Tuple[str, ...]: lambda x: tuple(x) if x is not None else None,
                 },
             )
-            kwargs["dycore_config"] = dacite.from_dict(
-                data_class=DynamicalCoreConfig,
-                data=kwargs.get("dycore_config", {}),
-                config=dycore_dacite_config,
-            )
-
-        if isinstance(kwargs["physics_config"], dict):
             kwargs["physics_config"] = dacite.from_dict(
                 data_class=PhysicsConfig,
                 data=kwargs.get("physics_config", {}),
-                config=dacite.Config(strict=True),
+                config=phys_dacite_config,
             )
 
         kwargs["layout"] = tuple(kwargs["layout"])