diff --git a/src/diagnostics/define_diagnostics.jl b/src/diagnostics/define_diagnostics.jl index be87a56edb..218d7e374a 100644 --- a/src/diagnostics/define_diagnostics.jl +++ b/src/diagnostics/define_diagnostics.jl @@ -261,7 +261,7 @@ function define_diagnostics!(land_model) ) # Rainfall - add_diagnostic_variable!( + add_diagnostic_variable!( short_name = "rain", long_name = "Rainfall", standard_name = "rainfall", @@ -420,7 +420,7 @@ function define_diagnostics!(land_model) land_model, ), ) - + # TNIR - transmitted near infrared radiation add_diagnostic_variable!( short_name = "tnir", diff --git a/src/diagnostics/diagnostic.jl b/src/diagnostics/diagnostic.jl index 4894dd3f9c..fecc9b5fc9 100644 --- a/src/diagnostics/diagnostic.jl +++ b/src/diagnostics/diagnostic.jl @@ -89,8 +89,7 @@ function get_diagnostic_variable(short_name) end # Do you want to define more diagnostics? Add them here -include("bucket_compute_methods.jl") -include("soilcanopy_compute_methods.jl") +include("land_compute_methods.jl") # define_diagnostics.jl contains the list of all the diagnostics include("define_diagnostics.jl") diff --git a/src/diagnostics/land_compute_methods.jl b/src/diagnostics/land_compute_methods.jl index 6293a61462..1501925d26 100644 --- a/src/diagnostics/land_compute_methods.jl +++ b/src/diagnostics/land_compute_methods.jl @@ -121,7 +121,9 @@ end @land_compute "infiltration" SoilCanopyModel p.soil.infiltration @land_compute "soil_hydraulic_conductivity" SoilCanopyModel p.soil.K @land_compute "soil_thermal_conductivity" SoilCanopyModel p.soil.κ -@land_compute "soil_water_liquid" SoilCanopyModel top_center_to_surface(p.soil.θ_l) +@land_compute "soil_water_liquid" SoilCanopyModel top_center_to_surface( + p.soil.θ_l, +) @land_compute "soil_water_potential" SoilCanopyModel p.soil.ψ @land_compute "soil_net_radiation" SoilCanopyModel p.soil.R_n @land_compute "soil_temperature" SoilCanopyModel p.soil.T @@ -141,4 +143,3 @@ end @land_compute "canopy_temperature" SoilCanopyModel Y.canopy.energy.T @land_compute "soil_ice" SoilCanopyModel top_center_to_surface(Y.soil.θ_i) @land_compute "soilco2" SoilCanopyModel Y.soilco2.C -