Changes the field name from model to input_model in config schema

benchmarks/run_stardis.py

@@ -46,10 +46,10 @@ def setup(self):
         adata = AtomData.from_hdf(config.atom_data)
 
         raw_marcs_model = read_marcs_model(
-            Path(config.model.fname), gzipped=config.model.gzipped
+            Path(config.input_model.fname), gzipped=config.input_model.gzipped
         )
         stellar_model = raw_marcs_model.to_stellar_model(
-            adata, final_atomic_number=config.model.final_atomic_number
+            adata, final_atomic_number=config.input_model.final_atomic_number
         )
 
         adata.prepare_atom_data(
@@ -60,7 +60,7 @@ def setup(self):
                         len(
                             stellar_model.composition.elemental_mass_fraction.columns.tolist()
                         ),
-                        config.model.final_atomic_number,
+                        config.input_model.final_atomic_number,
                     ]
                 )
                 + 1,
@@ -157,10 +157,10 @@ def setup(self):
         adata = AtomData.from_hdf(config.atom_data)
 
         raw_marcs_model = read_marcs_model(
-            Path(config.model.fname), gzipped=config.model.gzipped
+            Path(config.input_model.fname), gzipped=config.input_model.gzipped
         )
         stellar_model = raw_marcs_model.to_stellar_model(
-            adata, final_atomic_number=config.model.final_atomic_number
+            adata, final_atomic_number=config.input_model.final_atomic_number
         )
 
         adata.prepare_atom_data(
@@ -171,7 +171,7 @@ def setup(self):
                         len(
                             stellar_model.composition.elemental_mass_fraction.columns.tolist()
                         ),
-                        config.model.final_atomic_number,
+                        config.input_model.final_atomic_number,
                     ]
                 )
                 + 1,

stardis/conftest.py

@@ -93,11 +93,12 @@ def example_config_parallel():
 @pytest.fixture(scope="session")
 def example_stellar_model(example_config, example_kurucz_atomic_data):
     raw_marcs_model = read_marcs_model(
-        Path(example_config.model.fname), gzipped=example_config.model.gzipped
+        Path(example_config.input_model.fname),
+        gzipped=example_config.input_model.gzipped,
     )
     return raw_marcs_model.to_stellar_model(
         example_kurucz_atomic_data,
-        final_atomic_number=example_config.model.final_atomic_number,
+        final_atomic_number=example_config.input_model.final_atomic_number,
     )
 
 
@@ -113,7 +114,7 @@ def example_stellar_plasma(
                     len(
                         example_stellar_model.composition.elemental_mass_fraction.columns.tolist()
                     ),
-                    example_config.model.final_atomic_number,
+                    example_config.input_model.final_atomic_number,
                 ]
             )
             + 1,

stardis/io/base.py

@@ -68,27 +68,27 @@ def parse_config_to_model(config_fname, add_config_dict):
 
     # model
     logger.info("Reading model")
-    if config.model.type == "marcs":
+    if config.input_model.type == "marcs":
         raw_marcs_model = read_marcs_model(
-            Path(config.model.fname), gzipped=config.model.gzipped
+            Path(config.input_model.fname), gzipped=config.input_model.gzipped
         )
         stellar_model = raw_marcs_model.to_stellar_model(
-            adata, final_atomic_number=config.model.final_atomic_number
+            adata, final_atomic_number=config.input_model.final_atomic_number
         )
         if config.opacity.line.disable_microturbulence:
             stellar_model.microturbulence = stellar_model.microturbulence * 0.0
 
-    elif config.model.type == "mesa":
-        raw_mesa_model = read_mesa_model(Path(config.model.fname))
-        if config.model.truncate_to_shell != -99:
-            raw_mesa_model.truncate_model(config.model.truncate_to_shell)
-        elif config.model.truncate_to_shell < 0:
+    elif config.input_model.type == "mesa":
+        raw_mesa_model = read_mesa_model(Path(config.input_model.fname))
+        if config.input_model.truncate_to_shell != -99:
+            raw_mesa_model.truncate_model(config.input_model.truncate_to_shell)
+        elif config.input_model.truncate_to_shell < 0:
             raise ValueError(
-                f"{config.model.truncate_to_shell} shells were requested for mesa model truncation. -99 is default for no truncation."
+                f"{config.input_model.truncate_to_shell} shells were requested for mesa model truncation. -99 is default for no truncation."
             )
 
         stellar_model = raw_mesa_model.to_stellar_model(
-            adata, final_atomic_number=config.model.final_atomic_number
+            adata, final_atomic_number=config.input_model.final_atomic_number
         )
 
     else:
@@ -103,7 +103,7 @@ def parse_config_to_model(config_fname, add_config_dict):
                     len(
                         stellar_model.composition.elemental_mass_fraction.columns.tolist()
                     ),
-                    config.model.final_atomic_number,
+                    config.input_model.final_atomic_number,
                 ]
             )
             + 1,
@@ -114,15 +114,15 @@ def parse_config_to_model(config_fname, add_config_dict):
     )
 
     if (
-        not config.model.nuclide_rescaling_dict
+        not config.input_model.nuclide_rescaling_dict
     ):  # Pass if no rescaling is requested, else rescale by dictionary values provided
         pass
     else:
         stellar_model.composition.nuclide_mass_fraction = (
             rescale_nuclide_mass_fractions(
                 stellar_model.composition.nuclide_mass_fraction,
-                list(config.model.nuclide_rescaling_dict.keys()),
-                list(config.model.nuclide_rescaling_dict.values()),
+                list(config.input_model.nuclide_rescaling_dict.keys()),
+                list(config.input_model.nuclide_rescaling_dict.values()),
             )
         )
 

stardis/io/schemas/config_schema.yml

@@ -12,8 +12,8 @@ properties:
     atom_data:
         type: string
         description: Path to the atomic data file. The file should be in hdf5 format output by carsus.
-    model:
-        $ref: model.yml
+    input_model:
+        $ref: input_model.yml
         description: defining the model used in the simulation
     opacity:
         $ref: opacity.yml

stardis/io/schemas/model.yml → stardis/io/schemas/input_model.yml

@@ -1,4 +1,4 @@
-$$target: model.yml
+$$target: input_model.yml
 type: object
 properties:
     type:
@@ -28,4 +28,4 @@ properties:
         description: Rescale the abundances of the elements/nuclides in the model. The keys are the atomic numbers of the elements to rescale and the values are the rescaling factors.
 required:
 - type
-- fname
+- fname

stardis/tests/stardis_test_config.yml

@@ -1,6 +1,6 @@
 stardis_config_version: 1.0
 atom_data: kurucz_cd23_chianti_H_He.h5
-model:
+input_model:
     type: marcs
     fname: docs/quickstart/sun.mod
     final_atomic_number: 5