Commit 6d1befd6 authored by Jorn Bruggeman's avatar Jorn Bruggeman
Browse files

export standard_variables as fabm_standard_variables

parent ffc60aa5
......@@ -17,10 +17,8 @@
module fabm
use fabm_standard_variables, only: type_interior_standard_variable, type_horizontal_standard_variable, &
type_global_standard_variable, initialize_standard_variables, type_standard_variable_node
use fabm_parameters
use fabm_types, rki => rk
use fabm_types, rki => rk, fabm_standard_variables => standard_variables
use fabm_expressions
use fabm_driver
use fabm_properties
......@@ -30,6 +28,8 @@ module fabm
use fabm_schedule
use fabm_debug
use fabm_work
use fabm_standard_variables, only: type_interior_standard_variable, type_horizontal_standard_variable, &
type_global_standard_variable, initialize_standard_variables, type_standard_variable_node
implicit none
......@@ -52,7 +52,7 @@ module fabm
! Object with all supported standard variables as its members.
! Imported from fabm_types, and made available so hosts only need to "use fabm"
public standard_variables
public fabm_standard_variables
logical, save, public :: fabm_log = .false.
......
......@@ -6,7 +6,7 @@ module fabm_v0_compatibility
use fabm, type_bulk_variable_id => type_fabm_interior_variable_id, type_horizontal_variable_id => type_fabm_horizontal_variable_id, type_scalar_variable_id => type_fabm_scalar_variable_id, type_external_variable => type_fabm_variable, type_horizontal_state_variable_info => type_fabm_horizontal_state_variable
use fabm_config, only: fabm_configure_model
use fabm_properties, only: type_property_dictionary
use fabm_types, only: rke, attribute_length, source_get_light_extinction, source_get_albedo, source_get_drag, type_base_model, type_model_list_node, type_bulk_standard_variable
use fabm_types, only: rke, attribute_length, source_get_light_extinction, source_get_albedo, source_get_drag, type_base_model, type_model_list_node, type_bulk_standard_variable, standard_variables
use fabm_debug
use fabm_job, only: type_job, type_call
use fabm_driver, only: driver
......@@ -16,7 +16,7 @@ module fabm_v0_compatibility
public fabm_create_model_from_yaml_file
public type_bulk_variable_id, type_external_variable, type_model
public type_bulk_variable_id, type_external_variable, type_model, standard_variables
public fabm_initialize, fabm_finalize, fabm_set_domain, fabm_check_ready, fabm_update_time
public fabm_initialize_state, fabm_initialize_surface_state, fabm_initialize_bottom_state
......
......@@ -33,7 +33,7 @@ end module host_hooks
program test_host
use fabm, only: type_fabm_model, standard_variables, type_fabm_interior_variable_id, type_fabm_horizontal_variable_id, &
use fabm, only: type_fabm_model, fabm_standard_variables, type_fabm_interior_variable_id, type_fabm_horizontal_variable_id, &
type_fabm_scalar_variable_id, fabm_initialize_library
use fabm_config
use fabm_driver
......@@ -400,12 +400,12 @@ program test_host
allocate(wind_speed _INDEX_HORIZONTAL_LOCATION_)
call start_test('link_interior_data')
call model%link_interior_data(standard_variables%temperature, temperature)
call model%link_interior_data(standard_variables%depth, depth)
call model%link_interior_data(fabm_standard_variables%temperature, temperature)
call model%link_interior_data(fabm_standard_variables%depth, depth)
call report_test_result()
call start_test('link_horizontal_data')
call model%link_horizontal_data(standard_variables%wind_speed, wind_speed)
call model%link_horizontal_data(fabm_standard_variables%wind_speed, wind_speed)
call report_test_result()
case (2)
call read_environment
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment