Commit 0b2b1b9a authored by Jorn Bruggeman's avatar Jorn Bruggeman
Browse files

apply editorconfig whitespace conventions

parent 43999f9c
...@@ -36,8 +36,8 @@ endif() ...@@ -36,8 +36,8 @@ endif()
set(FABM_INSTITUTES ${DEFAULT_INSTITUTES} CACHE STRING "Institute directories to include during compilation.") set(FABM_INSTITUTES ${DEFAULT_INSTITUTES} CACHE STRING "Institute directories to include during compilation.")
if(FABM_INSTITUTES STREQUAL FABM_DEFAULT_INSTITUTES) if(FABM_INSTITUTES STREQUAL FABM_DEFAULT_INSTITUTES)
# FABM_INSTITUTES matches its original default value; update both with the current DEFAULT_INSTITUTES list. # FABM_INSTITUTES matches its original default value; update both with the current DEFAULT_INSTITUTES list.
set(FABM_INSTITUTES ${DEFAULT_INSTITUTES} CACHE STRING "Institute directories to include during compilation." FORCE) set(FABM_INSTITUTES ${DEFAULT_INSTITUTES} CACHE STRING "Institute directories to include during compilation." FORCE)
set(FABM_DEFAULT_INSTITUTES ${DEFAULT_INSTITUTES} CACHE INTERNAL "Default institutes at the time FABM_INSTITUTES was initialized or updated automatically.") set(FABM_DEFAULT_INSTITUTES ${DEFAULT_INSTITUTES} CACHE INTERNAL "Default institutes at the time FABM_INSTITUTES was initialized or updated automatically.")
endif() endif()
# Use solution folders in IDEs # Use solution folders in IDEs
...@@ -171,7 +171,7 @@ if(FABM_EMBED_VERSION) ...@@ -171,7 +171,7 @@ if(FABM_EMBED_VERSION)
add_custom_target(fabm_version add_custom_target(fabm_version
${CMAKE_COMMAND} -DINFILE=${CMAKE_CURRENT_LIST_DIR}/fabm_version.F90.in -DOUTFILE=${CMAKE_CURRENT_BINARY_DIR}/fabm_version.F90 -P ${GET_GIT_INFO_SCRIPT} ${CMAKE_COMMAND} -DINFILE=${CMAKE_CURRENT_LIST_DIR}/fabm_version.F90.in -DOUTFILE=${CMAKE_CURRENT_BINARY_DIR}/fabm_version.F90 -P ${GET_GIT_INFO_SCRIPT}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
COMMENT "Retrieving description of last FABM commit..." COMMENT "Retrieving description of last FABM commit..."
SOURCES ${CMAKE_CURRENT_LIST_DIR}/fabm_version.F90.in ${GET_GIT_INFO_SCRIPT} SOURCES ${CMAKE_CURRENT_LIST_DIR}/fabm_version.F90.in ${GET_GIT_INFO_SCRIPT}
VERBATIM VERBATIM
) )
...@@ -207,7 +207,7 @@ foreach(institute ${ACTIVE_INSTITUTES}) ...@@ -207,7 +207,7 @@ foreach(institute ${ACTIVE_INSTITUTES})
target_include_directories(fabm_models_${institute} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/models/${institute}") target_include_directories(fabm_models_${institute} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/models/${institute}")
list(APPEND MODEL_OBJECTS $<TARGET_OBJECTS:fabm_models_${institute}>) list(APPEND MODEL_OBJECTS $<TARGET_OBJECTS:fabm_models_${institute}>)
set_property(TARGET fabm_models_${institute} PROPERTY FOLDER fabm/models) set_property(TARGET fabm_models_${institute} PROPERTY FOLDER fabm/models)
endforeach(institute) endforeach(institute)
# Add YAML parsing library # Add YAML parsing library
if(NOT TARGET yaml) if(NOT TARGET yaml)
......
...@@ -879,7 +879,7 @@ contains ...@@ -879,7 +879,7 @@ contains
end function get_interior_variable_id_by_name end function get_interior_variable_id_by_name
! -------------------------------------------------------------------------- ! --------------------------------------------------------------------------
! get_interior_variable_id_sn: get interior variable identifier for given ! get_interior_variable_id_sn: get interior variable identifier for given
! standard variable ! standard variable
! -------------------------------------------------------------------------- ! --------------------------------------------------------------------------
function get_interior_variable_id_sn(self, standard_variable) result(id) function get_interior_variable_id_sn(self, standard_variable) result(id)
...@@ -1300,7 +1300,7 @@ contains ...@@ -1300,7 +1300,7 @@ contains
integer, intent(in) :: index integer, intent(in) :: index
real(rke) _ATTRIBUTES_GLOBAL_, pointer :: dat real(rke) _ATTRIBUTES_GLOBAL_, pointer :: dat
_ASSERT_(self%status >= status_start_done, 'get_interior_diagnostic_data', 'This routine can only be called after model start.') _ASSERT_(self%status >= status_start_done, 'get_interior_diagnostic_data', 'This routine can only be called after model start.')
dat => null() dat => null()
if (self%diagnostic_variables(index)%target%catalog_index /= -1) & if (self%diagnostic_variables(index)%target%catalog_index /= -1) &
dat => self%catalog%interior(self%diagnostic_variables(index)%target%catalog_index)%p dat => self%catalog%interior(self%diagnostic_variables(index)%target%catalog_index)%p
...@@ -1657,7 +1657,7 @@ contains ...@@ -1657,7 +1657,7 @@ contains
self%cache_hz%set_horizontal = .false. self%cache_hz%set_horizontal = .false.
self%cache_hz%set_interior = .false. self%cache_hz%set_interior = .false.
call process_horizontal_slice(job%first_task, self%domain, self%catalog, self%cache_fill_values, self%store, self%cache_hz _POSTARG_HORIZONTAL_IN_) call process_horizontal_slice(job%first_task, self%domain, self%catalog, self%cache_fill_values, self%store, self%cache_hz _POSTARG_HORIZONTAL_IN_)
valid = self%cache_hz%valid valid = self%cache_hz%valid
if (.not. (valid .or. repair)) return if (.not. (valid .or. repair)) return
...@@ -1790,7 +1790,7 @@ contains ...@@ -1790,7 +1790,7 @@ contains
# endif # endif
#endif #endif
call process_horizontal_slice(self%get_surface_sources_job%first_task, self%domain, self%catalog, self%cache_fill_values, self%store, self%cache_hz _POSTARG_HORIZONTAL_IN_) call process_horizontal_slice(self%get_surface_sources_job%first_task, self%domain, self%catalog, self%cache_fill_values, self%store, self%cache_hz _POSTARG_HORIZONTAL_IN_)
! Compose surface fluxes for each interior state variable, combining model-specific contributions. ! Compose surface fluxes for each interior state variable, combining model-specific contributions.
flux_pel = 0.0_rke flux_pel = 0.0_rke
...@@ -1828,7 +1828,7 @@ contains ...@@ -1828,7 +1828,7 @@ contains
# endif # endif
#endif #endif
call process_horizontal_slice(self%get_bottom_sources_job%first_task, self%domain, self%catalog, self%cache_fill_values, self%store, self%cache_hz _POSTARG_HORIZONTAL_IN_) call process_horizontal_slice(self%get_bottom_sources_job%first_task, self%domain, self%catalog, self%cache_fill_values, self%store, self%cache_hz _POSTARG_HORIZONTAL_IN_)
! Compose bottom fluxes for each interior state variable, combining model-specific contributions. ! Compose bottom fluxes for each interior state variable, combining model-specific contributions.
do i = 1, size(self%get_bottom_sources_job%arg1_sources) do i = 1, size(self%get_bottom_sources_job%arg1_sources)
......
...@@ -158,7 +158,7 @@ module fabm_builtin_models ...@@ -158,7 +158,7 @@ module fabm_builtin_models
contains contains
procedure :: after_coupling => horizontal_layer_after_coupling procedure :: after_coupling => horizontal_layer_after_coupling
end type end type
type,extends(type_horizontal_layer) :: type_bottom_field type,extends(type_horizontal_layer) :: type_bottom_field
contains contains
procedure :: initialize => bottom_field_initialize procedure :: initialize => bottom_field_initialize
......
...@@ -153,4 +153,4 @@ contains ...@@ -153,4 +153,4 @@ contains
end if end if
end subroutine check_index end subroutine check_index
end module end module
\ No newline at end of file
...@@ -51,4 +51,4 @@ contains ...@@ -51,4 +51,4 @@ contains
call driver%log_message(message) call driver%log_message(message)
end subroutine end subroutine
end module end module
\ No newline at end of file
...@@ -173,4 +173,4 @@ contains ...@@ -173,4 +173,4 @@ contains
expression%period = period expression%period = period
end function end function
end module fabm_expressions end module fabm_expressions
\ No newline at end of file
...@@ -1254,7 +1254,7 @@ contains ...@@ -1254,7 +1254,7 @@ contains
if (allocated(self%arg2_sources)) then if (allocated(self%arg2_sources)) then
_ASSERT_(all(self%arg2_sources > 0), 'job_process_indices', 'BUG: one or more source indices for argument 2 of job ' // trim(self%name) // ' are invalid.') _ASSERT_(all(self%arg2_sources > 0), 'job_process_indices', 'BUG: one or more source indices for argument 2 of job ' // trim(self%name) // ' are invalid.')
end if end if
task => self%first_task task => self%first_task
do while (associated(task)) do while (associated(task))
call task_process_indices(task, unfulfilled_dependencies) call task_process_indices(task, unfulfilled_dependencies)
...@@ -1426,7 +1426,7 @@ contains ...@@ -1426,7 +1426,7 @@ contains
call add_to_order(node%p) call add_to_order(node%p)
node => node%next node => node%next
end do end do
! Append to list ! Append to list
if (associated(first_ordered)) then if (associated(first_ordered)) then
node => first_ordered node => first_ordered
......
...@@ -99,7 +99,7 @@ contains ...@@ -99,7 +99,7 @@ contains
do while (associated(schedule)) do while (associated(schedule))
select case (schedule%pattern) select case (schedule%pattern)
case (schedule_pattern_monthly) case (schedule_pattern_monthly)
active = month > schedule%last_month .or. year > schedule%last_year active = month > schedule%last_month .or. year > schedule%last_year
end select end select
if (active) then if (active) then
schedule%last_year = year schedule%last_year = year
...@@ -115,4 +115,4 @@ contains ...@@ -115,4 +115,4 @@ contains
end do end do
end subroutine end subroutine
end module end module
\ No newline at end of file
...@@ -350,4 +350,4 @@ contains ...@@ -350,4 +350,4 @@ contains
self%first => null() self%first => null()
end subroutine standard_variable_set_finalize end subroutine standard_variable_set_finalize
end module fabm_standard_variables end module fabm_standard_variables
\ No newline at end of file
...@@ -11,7 +11,7 @@ module fabm_task_order ...@@ -11,7 +11,7 @@ module fabm_task_order
private private
public find_best_order, type_step, type_graph_subset_node_pointer public find_best_order, type_step, type_graph_subset_node_pointer
type type_graph_subset_node_pointer type type_graph_subset_node_pointer
type (type_graph_subset_node), pointer :: p => null() type (type_graph_subset_node), pointer :: p => null()
type (type_graph_subset_node_pointer), pointer :: next => null() type (type_graph_subset_node_pointer), pointer :: next => null()
...@@ -382,4 +382,4 @@ contains ...@@ -382,4 +382,4 @@ contains
end select end select
end function is_source_compatible end function is_source_compatible
end module end module
\ No newline at end of file
...@@ -249,7 +249,7 @@ contains ...@@ -249,7 +249,7 @@ contains
class (type_model), intent(inout) :: self class (type_model), intent(inout) :: self
_DECLARE_ARGUMENTS_INTERIOR_IN_ _DECLARE_ARGUMENTS_INTERIOR_IN_
real(rke) _DIMENSION_EXT_SLICE_PLUS_1_, intent(out) :: velocity real(rke) _DIMENSION_EXT_SLICE_PLUS_1_, intent(out) :: velocity
call self%get_vertical_movement(_PREARG_INTERIOR_IN_ velocity) call self%get_vertical_movement(_PREARG_INTERIOR_IN_ velocity)
end subroutine end subroutine
subroutine fabm_get_conserved_quantities(self _POSTARG_INTERIOR_IN_, sums) subroutine fabm_get_conserved_quantities(self _POSTARG_INTERIOR_IN_, sums)
...@@ -415,12 +415,12 @@ contains ...@@ -415,12 +415,12 @@ contains
type (type_bulk_variable_id) :: id type (type_bulk_variable_id) :: id
id = self%get_interior_variable_id(name) id = self%get_interior_variable_id(name)
end function end function
function fabm_get_bulk_variable_id_sn(self, standard_variable) result(id) function fabm_get_bulk_variable_id_sn(self, standard_variable) result(id)
class (type_model), intent(in) :: self class (type_model), intent(in) :: self
type (type_interior_standard_variable), intent(in) :: standard_variable type (type_interior_standard_variable), intent(in) :: standard_variable
type (type_bulk_variable_id) :: id type (type_bulk_variable_id) :: id
id = self%get_interior_variable_id(standard_variable) id = self%get_interior_variable_id(standard_variable)
end function end function
end module end module
\ No newline at end of file
...@@ -967,4 +967,4 @@ end subroutine end_vertical_task ...@@ -967,4 +967,4 @@ end subroutine end_vertical_task
end do end do
end subroutine check_vertical_call_output end subroutine check_vertical_call_output
end module end module
\ No newline at end of file
...@@ -35,7 +35,7 @@ contains ...@@ -35,7 +35,7 @@ contains
end subroutine end subroutine
end module host_hooks end module host_hooks
program test_host program test_host
use fabm use fabm
...@@ -609,7 +609,7 @@ contains ...@@ -609,7 +609,7 @@ contains
# endif # endif
#endif #endif
end subroutine end subroutine
subroutine simulate(n) subroutine simulate(n)
integer, intent(in) :: n integer, intent(in) :: n
real(rke) :: time_begin, time_end real(rke) :: time_begin, time_end
......
...@@ -36,4 +36,4 @@ program test_yaml ...@@ -36,4 +36,4 @@ program test_yaml
end if end if
call root%dump(unit=output_unit,indent=0) call root%dump(unit=output_unit,indent=0)
end program end program
\ No newline at end of file
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