Oliver E suggestions

NOAA-GFDL · Sep 27, 2023 · b20e85b · b20e85b
1 parent 255f1de
commit b20e85b
Show file tree

Hide file tree

Showing 8 changed files with 613 additions and 651 deletions.
diff --git a/driver/pace/driver/initialization.py b/driver/pace/driver/initialization.py
@@ -110,7 +110,7 @@ def get_driver_state(
         driver_grid_data: pace.util.grid.DriverGridData,
         grid_data: pace.util.grid.GridData,
     ) -> DriverState:
-        dycore_state = analytic_init.init_analytic_choice(
+        dycore_state = analytic_init.init_analytic_state(
             analytic_init_str=self.case,
             grid_data=grid_data,
             quantity_factory=quantity_factory,

diff --git a/environment.yml b/environment.yml
diff --git a/fv3core/pace/fv3core/initialization/__init__.py b/fv3core/pace/fv3core/initialization/__init__.py
@@ -1,4 +1 @@
-# from .baroclinic import init_baroclinic_state
-# from .tropical_cyclone import init_tc_state
-from .test_cases.initialize_baroclinic import init_baroclinic_state
-from .test_cases.initialize_tc import init_tc_state
+from .analytic_init.py import init_analytic_state
diff --git a/fv3core/pace/fv3core/initialization/analytic_init.py b/fv3core/pace/fv3core/initialization/analytic_init.py
@@ -13,7 +13,7 @@ class cases(Enum):
 valid_cases = [item.value for item in cases]
 
 
-def init_analytic_choice(
+def init_analytic_state(
     analytic_init_str: str,
     grid_data: GridData,
     quantity_factory: fv3util.QuantityFactory,
@@ -43,9 +43,9 @@ def init_analytic_choice(
             return bc.init_baroclinic_state(
                 grid_data=grid_data,
                 quantity_factory=quantity_factory,
-                adiabatic=False,
-                hydrostatic=False,
-                moist_phys=True,
+                adiabatic=adiabatic,
+                hydrostatic=hydrostatic,
+                moist_phys=moist_phys,
                 comm=comm,
             )
 
@@ -55,7 +55,7 @@ def init_analytic_choice(
             return tc.init_tc_state(
                 grid_data=grid_data,
                 quantity_factory=quantity_factory,
-                hydrostatic=False,
+                hydrostatic=hydrostatic,
                 comm=comm,
             )
         else: