Skip to content

Commit

Permalink
working analytic/ode tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ecoon
ecoon committed Mar 1, 2024
1 parent 6911cc3 commit 0521730
Show file tree
Hide file tree
Showing 9 changed files with 193 additions and 162 deletions.
1 change: 1 addition & 0 deletions src/executables/CMakeLists.txt
View file
Expand Up @@ -100,6 +100,7 @@ set(ats_link_libs
#ats_pks
ats_flow
ats_mpc
ats_surface_balance
)


Expand Down
2 changes: 1 addition & 1 deletion src/executables/ats_registration_files.hh
View file
Expand Up @@ -18,7 +18,7 @@
#include "ats_flow_relations_registration.hh"
//#include "ats_deformation_registration.hh"
//#include "ats_bgc_registration.hh"
//#include "ats_surface_balance_registration.hh"
#include "ats_surface_balance_registration.hh"
#include "ats_mpc_registration.hh"
//#include "ats_sediment_transport_registration.hh"
//#include "models_transport_reg.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/pks/CMakeLists.txt
View file
Expand Up @@ -41,6 +41,6 @@ add_subdirectory(flow)
# add_subdirectory(transport)
# add_subdirectory(transport/sediment_transport)
# add_subdirectory(deform)
# add_subdirectory(surface_balance)
add_subdirectory(surface_balance)
# add_subdirectory(biogeochemistry)
add_subdirectory(mpc)
203 changes: 101 additions & 102 deletions src/pks/surface_balance/CMakeLists.txt
View file
Expand Up @@ -9,93 +9,93 @@ include_directories(${CLM_INCLUDE_DIRS})
include_directories(${ATS_SOURCE_DIR}/src/pks/flow/constitutive_relations/elevation) # subgrid model

set(ats_surface_balance_src_files
constitutive_relations/land_cover/seb_physics_defs.cc
constitutive_relations/land_cover/seb_physics_funcs.cc
constitutive_relations/land_cover/longwave_evaluator.cc
constitutive_relations/land_cover/incident_shortwave_radiation_model.cc
constitutive_relations/land_cover/incident_shortwave_radiation_evaluator.cc
constitutive_relations/land_cover/evaporation_downregulation_model.cc
constitutive_relations/land_cover/evaporation_downregulation_evaluator.cc
constitutive_relations/land_cover/LandCover.cc
constitutive_relations/land_cover/drainage_evaluator.cc
constitutive_relations/land_cover/interception_fraction_evaluator.cc
constitutive_relations/land_cover/interception_fraction_model.cc
constitutive_relations/land_cover/pet_priestley_taylor_evaluator.cc
constitutive_relations/land_cover/plant_wilting_factor_evaluator.cc
constitutive_relations/land_cover/plant_wilting_factor_model.cc
constitutive_relations/land_cover/rooting_depth_fraction_evaluator.cc
constitutive_relations/land_cover/rooting_depth_fraction_model.cc
constitutive_relations/land_cover/snow_meltrate_evaluator.cc
constitutive_relations/land_cover/transpiration_distribution_evaluator.cc
constitutive_relations/land_cover/albedo_twocomponent_evaluator.cc
constitutive_relations/land_cover/albedo_threecomponent_evaluator.cc
constitutive_relations/land_cover/area_fractions_twocomponent_evaluator.cc
constitutive_relations/land_cover/area_fractions_threecomponent_evaluator.cc
constitutive_relations/land_cover/area_fractions_threecomponent_microtopography_evaluator.cc
constitutive_relations/land_cover/radiation_balance_evaluator.cc
constitutive_relations/land_cover/canopy_radiation_evaluator.cc
constitutive_relations/land_cover/seb_twocomponent_evaluator.cc
constitutive_relations/land_cover/seb_threecomponent_evaluator.cc
constitutive_relations/litter/evaporative_flux_relaxation_evaluator.cc
constitutive_relations/litter/evaporative_flux_relaxation_model.cc
constitutive_relations/litter/micropore_macropore_flux_evaluator.cc
constitutive_relations/litter/micropore_macropore_flux_model.cc
# constitutive_relations/land_cover/seb_physics_defs.cc
# constitutive_relations/land_cover/seb_physics_funcs.cc
# constitutive_relations/land_cover/longwave_evaluator.cc
# constitutive_relations/land_cover/incident_shortwave_radiation_model.cc
# constitutive_relations/land_cover/incident_shortwave_radiation_evaluator.cc
# constitutive_relations/land_cover/evaporation_downregulation_model.cc
# constitutive_relations/land_cover/evaporation_downregulation_evaluator.cc
# constitutive_relations/land_cover/LandCover.cc
# constitutive_relations/land_cover/drainage_evaluator.cc
# constitutive_relations/land_cover/interception_fraction_evaluator.cc
# constitutive_relations/land_cover/interception_fraction_model.cc
# constitutive_relations/land_cover/pet_priestley_taylor_evaluator.cc
# constitutive_relations/land_cover/plant_wilting_factor_evaluator.cc
# constitutive_relations/land_cover/plant_wilting_factor_model.cc
# constitutive_relations/land_cover/rooting_depth_fraction_evaluator.cc
# constitutive_relations/land_cover/rooting_depth_fraction_model.cc
# constitutive_relations/land_cover/snow_meltrate_evaluator.cc
# constitutive_relations/land_cover/transpiration_distribution_evaluator.cc
# constitutive_relations/land_cover/albedo_twocomponent_evaluator.cc
# constitutive_relations/land_cover/albedo_threecomponent_evaluator.cc
# constitutive_relations/land_cover/area_fractions_twocomponent_evaluator.cc
# constitutive_relations/land_cover/area_fractions_threecomponent_evaluator.cc
# constitutive_relations/land_cover/area_fractions_threecomponent_microtopography_evaluator.cc
# constitutive_relations/land_cover/radiation_balance_evaluator.cc
# constitutive_relations/land_cover/canopy_radiation_evaluator.cc
# constitutive_relations/land_cover/seb_twocomponent_evaluator.cc
# constitutive_relations/land_cover/seb_threecomponent_evaluator.cc
# constitutive_relations/litter/evaporative_flux_relaxation_evaluator.cc
# constitutive_relations/litter/evaporative_flux_relaxation_model.cc
# constitutive_relations/litter/micropore_macropore_flux_evaluator.cc
# constitutive_relations/litter/micropore_macropore_flux_model.cc
surface_balance_base.cc
surface_balance_implicit_subgrid.cc
# surface_balance_implicit_subgrid.cc
)

if (ENABLE_CLM)
list(APPEND ats_surface_balance_src_files
CLM/ats_clm.F90
CLM/ats_clm_interface.cc
CLM/surface_balance_CLM.cc
)
endif()
# if (ENABLE_CLM)
# list(APPEND ats_surface_balance_src_files
# CLM/ats_clm.F90
# CLM/ats_clm_interface.cc
# CLM/surface_balance_CLM.cc
# )
# endif()

set(ats_surface_balance_inc_files
constitutive_relations/land_cover/seb_physics_defs.hh
constitutive_relations/land_cover/seb_physics_funcs.hh
constitutive_relations/land_cover/longwave_evaluator.hh
constitutive_relations/land_cover/incident_shortwave_radiation_model.hh
constitutive_relations/land_cover/incident_shortwave_radiation_evaluator.hh
constitutive_relations/land_cover/evaporation_downregulation_model.hh
constitutive_relations/land_cover/evaporation_downregulation_evaluator.hh
constitutive_relations/land_cover/LandCover.hh
constitutive_relations/land_cover/drainage_evaluator.hh
constitutive_relations/land_cover/interception_fraction_evaluator.hh
constitutive_relations/land_cover/interception_fraction_model.hh
constitutive_relations/land_cover/pet_priestley_taylor_evaluator.hh
constitutive_relations/land_cover/plant_wilting_factor_evaluator.hh
constitutive_relations/land_cover/plant_wilting_factor_model.hh
constitutive_relations/land_cover/rooting_depth_fraction_evaluator.hh
constitutive_relations/land_cover/rooting_depth_fraction_model.hh
constitutive_relations/land_cover/snow_meltrate_evaluator.hh
constitutive_relations/land_cover/transpiration_distribution_evaluator.hh
constitutive_relations/land_cover/albedo_twocomponent_evaluator.hh
constitutive_relations/land_cover/albedo_threecomponent_evaluator.hh
constitutive_relations/land_cover/area_fractions_twocomponent_evaluator.hh
constitutive_relations/land_cover/area_fractions_threecomponent_evaluator.hh
constitutive_relations/land_cover/area_fractions_threecomponent_microtopography_evaluator.hh
constitutive_relations/land_cover/radiation_balance_evaluator.hh
constitutive_relations/land_cover/canopy_radiation_evaluator.hh
constitutive_relations/land_cover/seb_twocomponent_evaluator.hh
constitutive_relations/land_cover/seb_threecomponent_evaluator.hh
constitutive_relations/litter/evaporative_flux_relaxation_evaluator.hh
constitutive_relations/litter/evaporative_flux_relaxation_model.hh
constitutive_relations/litter/micropore_macropore_flux_evaluator.hh
constitutive_relations/litter/micropore_macropore_flux_model.hh
# constitutive_relations/land_cover/seb_physics_defs.hh
# constitutive_relations/land_cover/seb_physics_funcs.hh
# constitutive_relations/land_cover/longwave_evaluator.hh
# constitutive_relations/land_cover/incident_shortwave_radiation_model.hh
# constitutive_relations/land_cover/incident_shortwave_radiation_evaluator.hh
# constitutive_relations/land_cover/evaporation_downregulation_model.hh
# constitutive_relations/land_cover/evaporation_downregulation_evaluator.hh
# constitutive_relations/land_cover/LandCover.hh
# constitutive_relations/land_cover/drainage_evaluator.hh
# constitutive_relations/land_cover/interception_fraction_evaluator.hh
# constitutive_relations/land_cover/interception_fraction_model.hh
# constitutive_relations/land_cover/pet_priestley_taylor_evaluator.hh
# constitutive_relations/land_cover/plant_wilting_factor_evaluator.hh
# constitutive_relations/land_cover/plant_wilting_factor_model.hh
# constitutive_relations/land_cover/rooting_depth_fraction_evaluator.hh
# constitutive_relations/land_cover/rooting_depth_fraction_model.hh
# constitutive_relations/land_cover/snow_meltrate_evaluator.hh
# constitutive_relations/land_cover/transpiration_distribution_evaluator.hh
# constitutive_relations/land_cover/albedo_twocomponent_evaluator.hh
# constitutive_relations/land_cover/albedo_threecomponent_evaluator.hh
# constitutive_relations/land_cover/area_fractions_twocomponent_evaluator.hh
# constitutive_relations/land_cover/area_fractions_threecomponent_evaluator.hh
# constitutive_relations/land_cover/area_fractions_threecomponent_microtopography_evaluator.hh
# constitutive_relations/land_cover/radiation_balance_evaluator.hh
# constitutive_relations/land_cover/canopy_radiation_evaluator.hh
# constitutive_relations/land_cover/seb_twocomponent_evaluator.hh
# constitutive_relations/land_cover/seb_threecomponent_evaluator.hh
# constitutive_relations/litter/evaporative_flux_relaxation_evaluator.hh
# constitutive_relations/litter/evaporative_flux_relaxation_model.hh
# constitutive_relations/litter/micropore_macropore_flux_evaluator.hh
# constitutive_relations/litter/micropore_macropore_flux_model.hh
surface_balance_base.hh
surface_balance_implicit_subgrid.hh
# surface_balance_implicit_subgrid.hh
)

if (ENABLE_CLM)
list(APPEND ats_surface_balance_inc_files
CLM/ats_clm.F90
CLM/surface_balance_CLM.hh
CLM/ats_clm_interface.hh
CLM/ats_clm_interface_private.hh
)
endif()
# if (ENABLE_CLM)
# list(APPEND ats_surface_balance_inc_files
# CLM/ats_clm.F90
# CLM/surface_balance_CLM.hh
# CLM/ats_clm_interface.hh
# CLM/ats_clm_interface_private.hh
# )
# endif()

set(ats_surface_balance_link_libs
${Teuchos_LIBRARIES}
Expand All @@ -112,7 +112,6 @@ set(ats_surface_balance_link_libs
state
pks
ats_operators
ats_pks
)

add_amanzi_library(ats_surface_balance
Expand All @@ -125,37 +124,37 @@ add_amanzi_library(ats_surface_balance
# register evaluators/factories/pks

# land_cover evalutors
register_evaluator_with_factory(
HEADERFILE constitutive_relations/land_cover/land_cover_evaluator_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
)
# register_evaluator_with_factory(
# HEADERFILE constitutive_relations/land_cover/land_cover_evaluator_reg.hh
# LISTNAME ATS_SURFACE_BALANCE_REG
# )

register_evaluator_with_factory(
HEADERFILE constitutive_relations/litter/micropore_macropore_flux_evaluator_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
)
# register_evaluator_with_factory(
# HEADERFILE constitutive_relations/litter/micropore_macropore_flux_evaluator_reg.hh
# LISTNAME ATS_SURFACE_BALANCE_REG
# )

register_evaluator_with_factory(
HEADERFILE constitutive_relations/litter/evaporative_flux_relaxation_evaluator_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
)
# register_evaluator_with_factory(
# HEADERFILE constitutive_relations/litter/evaporative_flux_relaxation_evaluator_reg.hh
# LISTNAME ATS_SURFACE_BALANCE_REG
# )

if (ENABLE_CLM)
register_evaluator_with_factory(
HEADERFILE CLM/surface_balance_CLM_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
)
endif()
# if (ENABLE_CLM)
# register_evaluator_with_factory(
# HEADERFILE CLM/surface_balance_CLM_reg.hh
# LISTNAME ATS_SURFACE_BALANCE_REG
# )
# endif()

register_evaluator_with_factory(
HEADERFILE surface_balance_base_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
)

register_evaluator_with_factory(
HEADERFILE surface_balance_implicit_subgrid_reg.hh
LISTNAME ATS_SURFACE_BALANCE_REG
)
# register_evaluator_with_factory(
# HEADERFILE surface_balance_implicit_subgrid_reg.hh
# LISTNAME ATS_SURFACE_BALANCE_REG
# )

generate_evaluators_registration_header(
HEADERFILE ats_surface_balance_registration.hh
Expand Down

0 comments on commit 0521730

Please sign in to comment.