Commit e0431f5b authored by Jorn Bruggeman's avatar Jorn Bruggeman
Browse files

fabmd: added interior_ prefix

parent 279c1da8
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
model => fabm_create_model(path=trim(fabm_yaml_file)) model => fabm_create_model(path=trim(fabm_yaml_file))
! Shortcuts to the number of state variables. ! Shortcuts to the number of state variables.
n_int = size(model%state_variables) n_int = size(model%interior_state_variables)
n_sf = size(model%surface_state_variables) n_sf = size(model%surface_state_variables)
n_bt = size(model%bottom_state_variables) n_bt = size(model%bottom_state_variables)
...@@ -472,7 +472,7 @@ ...@@ -472,7 +472,7 @@
found = .true. found = .true.
case default case default
do i=1,n_int do i=1,n_int
if (variable_name=='deep/'//trim(model%state_variables(i)%path)) then if (variable_name=='deep/'//trim(model%interior_state_variables(i)%path)) then
call parse_input_variable(pair%key,pair%value,cc_deep(i)) call parse_input_variable(pair%key,pair%value,cc_deep(i))
found = .true. found = .true.
end if end if
......
...@@ -120,9 +120,9 @@ ...@@ -120,9 +120,9 @@
!EOP !EOP
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOC !BOC
do i=1,size(model%state_variables) do i=1,size(model%interior_state_variables)
pdata => model%get_data(model%get_interior_variable_id(model%state_variables(i)%name)) pdata => model%get_data(model%get_interior_variable_id(model%interior_state_variables(i)%name))
call fm%send_data(model%state_variables(i)%name, pdata) call fm%send_data(model%interior_state_variables(i)%name, pdata)
end do end do
do i=1,size(model%bottom_state_variables) do i=1,size(model%bottom_state_variables)
pdata => model%get_data(model%get_horizontal_variable_id(model%bottom_state_variables(i)%name)) pdata => model%get_data(model%get_horizontal_variable_id(model%bottom_state_variables(i)%name))
...@@ -133,10 +133,10 @@ ...@@ -133,10 +133,10 @@
call fm%send_data(model%surface_state_variables(i)%name, pdata) call fm%send_data(model%surface_state_variables(i)%name, pdata)
end do end do
do i=1,size(model%diagnostic_variables) do i=1,size(model%interior_diagnostic_variables)
if (model%diagnostic_variables(i)%save) then if (model%interior_diagnostic_variables(i)%save) then
pdata => model%get_interior_diagnostic_data(i) pdata => model%get_interior_diagnostic_data(i)
call fm%send_data(model%diagnostic_variables(i)%name, pdata) call fm%send_data(model%interior_diagnostic_variables(i)%name, pdata)
end if end if
end do end do
do i=1,size(model%horizontal_diagnostic_variables) do i=1,size(model%horizontal_diagnostic_variables)
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
call fm%register('salt','1e-3','salinity',standard_name='sea_water_practical_salinity',data0d=salt%value) call fm%register('salt','1e-3','salinity',standard_name='sea_water_practical_salinity',data0d=salt%value)
! state variables ! state variables
do i=1,size(model%state_variables) do i=1,size(model%interior_state_variables)
in_output = register(model%state_variables(i)) in_output = register(model%interior_state_variables(i))
end do end do
do i=1,size(model%bottom_state_variables) do i=1,size(model%bottom_state_variables)
in_output = register(model%bottom_state_variables(i)) in_output = register(model%bottom_state_variables(i))
...@@ -237,8 +237,8 @@ ...@@ -237,8 +237,8 @@
end do end do
! diagnostic variables ! diagnostic variables
do i=1,size(model%diagnostic_variables) do i=1,size(model%interior_diagnostic_variables)
model%diagnostic_variables(i)%save = register(model%diagnostic_variables(i)) model%interior_diagnostic_variables(i)%save = register(model%interior_diagnostic_variables(i))
end do end do
do i=1,size(model%horizontal_diagnostic_variables) do i=1,size(model%horizontal_diagnostic_variables)
model%horizontal_diagnostic_variables(i)%save = register(model%horizontal_diagnostic_variables(i)) model%horizontal_diagnostic_variables(i)%save = register(model%horizontal_diagnostic_variables(i))
......
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