Commit 207c653d authored by Jorn Bruggeman's avatar Jorn Bruggeman
Browse files

pyfabm fixes

parent 7e3b6e2f
......@@ -43,12 +43,12 @@
case (domain_interior)
if (.not. associated(model%catalog%interior(link%target%catalog_index)%p)) n = n + 1
if (index_column_depth == -1 .and. associated(link%target%standard_variables%first)) then
if (link%target%standard_variables%first%p%compare(standard_variables%cell_thickness)) index_column_depth = n
if (link%target%standard_variables%contains(standard_variables%cell_thickness)) index_column_depth = n
end if
case (domain_bottom, domain_surface, domain_horizontal)
if (.not. associated(model%catalog%horizontal(link%target%catalog_index)%p)) n = n + 1
if (index_column_depth==-1 .and. associated(link%target%standard_variables%first)) then
if (link%target%standard_variables%first%p%compare(standard_variables%bottom_depth)) index_column_depth = n
if (link%target%standard_variables%contains(standard_variables%bottom_depth)) index_column_depth = n
end if
case (domain_scalar)
if (.not. associated(model%catalog%scalar(link%target%catalog_index)%p)) n = n + 1
......
......@@ -28,7 +28,7 @@ def processFile(infile,outfile,subtract_background=False,add_missing=False):
# Load the old configuration
with open(infile,'rU') as f:
config = yaml.load(f)
config = yaml.safe_load(f)
def findMaximumDepth(d):
n = 0
......
......@@ -6,8 +6,7 @@ module fabm_python
!DIR$ ATTRIBUTES DLLEXPORT :: STATE_VARIABLE,DIAGNOSTIC_VARIABLE,CONSERVED_QUANTITY
use fabm, only: type_fabm_model, type_fabm_variable, fabm_get_version, status_start_done
use fabm_config
use fabm, only: type_fabm_model, type_fabm_variable, fabm_get_version, status_start_done, fabm_create_model
use fabm_types, only:rk => rke,attribute_length,type_model_list_node,type_base_model, &
factory,type_link,type_link_list,type_internal_variable
use fabm_driver, only: type_base_driver, driver, fatal_error
......
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