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

apply editorconfig whitespace conventions

parent 43999f9c
......@@ -36,8 +36,8 @@ endif()
set(FABM_INSTITUTES ${DEFAULT_INSTITUTES} CACHE STRING "Institute directories to include during compilation.")
if(FABM_INSTITUTES STREQUAL FABM_DEFAULT_INSTITUTES)
# 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_DEFAULT_INSTITUTES ${DEFAULT_INSTITUTES} CACHE INTERNAL "Default institutes at the time FABM_INSTITUTES was initialized or updated automatically.")
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.")
endif()
# Use solution folders in IDEs
......@@ -171,7 +171,7 @@ if(FABM_EMBED_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}
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}
VERBATIM
)
......@@ -207,7 +207,7 @@ foreach(institute ${ACTIVE_INSTITUTES})
target_include_directories(fabm_models_${institute} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/models/${institute}")
list(APPEND MODEL_OBJECTS $<TARGET_OBJECTS:fabm_models_${institute}>)
set_property(TARGET fabm_models_${institute} PROPERTY FOLDER fabm/models)
endforeach(institute)
endforeach(institute)
# Add YAML parsing library
if(NOT TARGET yaml)
......
......@@ -879,7 +879,7 @@ contains
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
! --------------------------------------------------------------------------
function get_interior_variable_id_sn(self, standard_variable) result(id)
......@@ -1300,7 +1300,7 @@ contains
integer, intent(in) :: index
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()
if (self%diagnostic_variables(index)%target%catalog_index /= -1) &
dat => self%catalog%interior(self%diagnostic_variables(index)%target%catalog_index)%p
......@@ -1657,7 +1657,7 @@ contains
self%cache_hz%set_horizontal = .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
if (.not. (valid .or. repair)) return
......@@ -1790,7 +1790,7 @@ contains
# 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.
flux_pel = 0.0_rke
......@@ -1828,7 +1828,7 @@ contains
# 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.
do i = 1, size(self%get_bottom_sources_job%arg1_sources)
......
......@@ -158,7 +158,7 @@ module fabm_builtin_models
contains
procedure :: after_coupling => horizontal_layer_after_coupling
end type
type,extends(type_horizontal_layer) :: type_bottom_field
contains
procedure :: initialize => bottom_field_initialize
......
......@@ -153,4 +153,4 @@ contains
end if
end subroutine check_index
end module
\ No newline at end of file
end module
......@@ -51,4 +51,4 @@ contains
call driver%log_message(message)
end subroutine
end module
\ No newline at end of file
end module
......@@ -173,4 +173,4 @@ contains
expression%period = period
end function
end module fabm_expressions
\ No newline at end of file
end module fabm_expressions
......@@ -1254,7 +1254,7 @@ contains
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.')
end if
task => self%first_task
do while (associated(task))
call task_process_indices(task, unfulfilled_dependencies)
......@@ -1426,7 +1426,7 @@ contains
call add_to_order(node%p)
node => node%next
end do
! Append to list
if (associated(first_ordered)) then
node => first_ordered
......
......@@ -99,7 +99,7 @@ contains
do while (associated(schedule))
select case (schedule%pattern)
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
if (active) then
schedule%last_year = year
......@@ -115,4 +115,4 @@ contains
end do
end subroutine
end module
\ No newline at end of file
end module
......@@ -350,4 +350,4 @@ contains
self%first => null()
end subroutine standard_variable_set_finalize
end module fabm_standard_variables
\ No newline at end of file
end module fabm_standard_variables
......@@ -11,7 +11,7 @@ module fabm_task_order
private
public find_best_order, type_step, 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), pointer :: next => null()
......@@ -382,4 +382,4 @@ contains
end select
end function is_source_compatible
end module
\ No newline at end of file
end module
......@@ -249,7 +249,7 @@ contains
class (type_model), intent(inout) :: self
_DECLARE_ARGUMENTS_INTERIOR_IN_
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
subroutine fabm_get_conserved_quantities(self _POSTARG_INTERIOR_IN_, sums)
......@@ -415,12 +415,12 @@ contains
type (type_bulk_variable_id) :: id
id = self%get_interior_variable_id(name)
end function
function fabm_get_bulk_variable_id_sn(self, standard_variable) result(id)
class (type_model), intent(in) :: self
type (type_interior_standard_variable), intent(in) :: standard_variable
type (type_bulk_variable_id) :: id
id = self%get_interior_variable_id(standard_variable)
end function
end module
\ No newline at end of file
end module
......@@ -967,4 +967,4 @@ end subroutine end_vertical_task
end do
end subroutine check_vertical_call_output
end module
\ No newline at end of file
end module
......@@ -35,7 +35,7 @@ contains
end subroutine
end module host_hooks
program test_host
use fabm
......@@ -609,7 +609,7 @@ contains
# endif
#endif
end subroutine
subroutine simulate(n)
integer, intent(in) :: n
real(rke) :: time_begin, time_end
......
......@@ -36,4 +36,4 @@ program test_yaml
end if
call root%dump(unit=output_unit,indent=0)
end program
\ No newline at end of file
end program
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