unify SoilCO2Model constructor format

Author: juliasloan25

docs/src/tutorials/integrated/soil_canopy_tutorial.jl

@@ -181,7 +181,7 @@ drivers = Soil.Biogeochemistry.SoilDrivers(
     soil_organic_carbon,
     atmos,
 );
-soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(; domain, drivers);
+soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(domain, drivers);
 
 # Read in prescribed LAI at the site from global MODIS data
 surface_space = domain.space.surface;

experiments/integrated/fluxnet/ozark_pft.jl

@@ -218,7 +218,7 @@ drivers = Soil.Biogeochemistry.SoilDrivers(
     soil_organic_carbon,
     atmos,
 )
-soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(; domain = soil_domain, drivers)
+soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(soil_domain, drivers)
 
 # Canopy model - Set up individual Component arguments with non-default parameters
 # Set up radiative transfer

experiments/integrated/global/global_soil_canopy.jl

@@ -81,7 +81,7 @@ drivers = Soil.Biogeochemistry.SoilDrivers(
     soil_organic_carbon,
     atmos,
 )
-soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(; domain, drivers)
+soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(domain, drivers)
 
 # Now we set up the canopy model, which mostly use defaults for:
 ground = ClimaLand.PrognosticSoilConditions{FT}()

experiments/integrated/performance/conservation/ozark_conservation_setup.jl

@@ -144,7 +144,7 @@ drivers = Soil.Biogeochemistry.SoilDrivers(
     soil_organic_carbon,
     atmos,
 )
-soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(; domain = land_domain, drivers)
+soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(land_domain, drivers)
 
 # Canopy model
 # Set up radiative transfer

experiments/integrated/performance/integrated_timestep_test.jl

@@ -232,7 +232,7 @@ drivers = Soil.Biogeochemistry.SoilDrivers(
     soil_organic_carbon,
     atmos,
 )
-soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(; domain = land_domain, drivers)
+soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(land_domain, drivers)
 
 # Canopy model setup
 # Radiative transfer model

src/integrated/land.jl

@@ -224,16 +224,18 @@ function LandModel{FT}(;
 
     soilco2_boundary_conditions =
         (; top = soilco2_top_bc, bottom = soilco2_bot_bc)
-    soilco2 = soilco2_type(;
+    soilco2 = soilco2_type(
+        soilco2_args.domain,
+        soilco2_drivers;
         boundary_conditions = soilco2_boundary_conditions,
         sources = soilco2_sources,
-        soilco2_args..., # adds domain, params
-        drivers = soilco2_drivers,
+        parameters = soilco2_args.parameters,
     )
 
     return LandModel{FT}(canopy, snow, soil, soilco2)
 end
 
+
 """
    ClimaLand.land_components(land::LandModel)
 

src/integrated/soil_canopy_model.jl

@@ -189,11 +189,12 @@ function SoilCanopyModel{FT}(;
 
     soilco2_boundary_conditions =
         (; top = soilco2_top_bc, bottom = soilco2_bot_bc)
-    soilco2 = soilco2_type(;
+    soilco2 = soilco2_type(
+        soilco2_args.domain,
+        soilco2_drivers;
         boundary_conditions = soilco2_boundary_conditions,
         sources = soilco2_sources,
-        soilco2_args...,
-        drivers = soilco2_drivers,
+        parameters = soilco2_args.parameters,
     )
 
     return SoilCanopyModel{FT}(soilco2, soil, canopy)

src/integrated/soil_energy_hydrology_biogeochemistry.jl

@@ -53,9 +53,11 @@ function LandSoilBiogeochemistry{FT}(;
         soil_organic_carbon,
         atmos,
     )
-    soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(;
-        soilco2_args...,
-        drivers = soil_co2_drivers,
+    soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(
+        soilco2_args.domain,
+        soil_co2_drivers;
+        boundary_conditions = soilco2_args.boundary_conditions,
+        parameters = soilco2_args.parameters,
     )
     args = (soil, soilco2)
     return LandSoilBiogeochemistry{FT, typeof.(args)...}(args...)

src/standalone/Soil/Biogeochemistry/Biogeochemistry.jl

@@ -133,9 +133,9 @@ end
 
 
 """
-SoilCO2Model{FT}(;
+SoilCO2Model{FT}(
         domain::ClimaLand.AbstractDomain,
-        drivers::DT,
+        drivers::DT;
         parameters = SoilCO2ModelParameters(FT),
         boundary_conditions::BC = (
             top = AtmosCO2StateBC(),
@@ -148,9 +148,9 @@ A constructor for `SoilCO2Model`.
 Defaults are provided for the parameters, boundary conditions, and sources.
 These can be overridden by providing the appropriate keyword arguments.
 """
-function SoilCO2Model{FT}(;
+function SoilCO2Model{FT}(
     domain::ClimaLand.AbstractDomain,
-    drivers::DT,
+    drivers::DT;
     parameters::SoilCO2ModelParameters{FT} = SoilCO2ModelParameters(FT),
     boundary_conditions::BC = (
         top = AtmosCO2StateBC(),

test/integrated/full_land.jl

@@ -43,10 +43,7 @@ for FT in (Float32, Float64)
             soil_organic_carbon,
             atmos,
         )
-        soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(;
-            domain,
-            drivers = soilco2_drivers,
-        )
+        soilco2 = Soil.Biogeochemistry.SoilCO2Model{FT}(domain, soilco2_drivers)
 
         # Canopy model
         surface_domain = Domains.obtain_surface_domain(domain)