Commit cee8c51d authored by Knut's avatar Knut
Browse files

removed whitespace at end of lines

parent c2fd5bbc
......@@ -178,7 +178,7 @@
#ifndef _FABM_REAL_KIND_
#define _FABM_REAL_KIND_ selected_real_kind(13)
#endif
#endif
! Constants related to floating point precision; used throughout FABM.
#undef REALTYPE
......
This diff is collapsed.
File mode changed from 100644 to 100755
......@@ -184,7 +184,7 @@ contains
call fatal_error('create_model_from_dictionary','BUG: "flatten" should &
&have ensured that the value of '//trim(value%path)//' is scalar, not a nested dictionary.')
end select
pair => pair%next
pair => pair%next
end do
end if
......@@ -222,7 +222,7 @@ contains
call fatal_error('create_model_from_dictionary','The value of '//trim(value%path)// &
' must be a string, not a nested dictionary.')
end select
pair => pair%next
pair => pair%next
end do
end if
......
......@@ -237,7 +237,7 @@ contains
recursive subroutine dictionary_set_path(self,path)
class (type_dictionary),intent(inout) :: self
character(len=*), intent(in) :: path
type (type_key_value_pair),pointer :: pair
self%path = path
......
......@@ -201,7 +201,7 @@ contains
call node%set(pair%key,pair%value)
end select
! Check indentation of next line.
! Check indentation of next line.
if (file%indent>firstindent) then
call file%set_error('unexpected increase in indentation following key-value pair "'//trim(pair%key)//'".')
return
......@@ -310,5 +310,5 @@ contains
file%error_message = error
file%has_error = .true.
end subroutine
end module fabm_yaml
......@@ -76,7 +76,7 @@
contains
#define _ODE_ZEROD_
#define _ODE_ZEROD_
#include "ode_solvers_template.F90"
!-----------------------------------------------------------------------
......@@ -96,7 +96,7 @@
!BOC
do i = 1, command_argument_count()
call get_command_argument(i, arg)
select case (arg)
#if 0
case ('-v', '--version')
......@@ -193,7 +193,7 @@
ode_method = 1
repair_state = .false.
read(namlst,nml=model_setup,err=91)
! Read environment namelist
env_file = ''
swr_method = 0
......@@ -247,7 +247,7 @@
end if
column_depth = depth ! Provided depth is the column depth. The modelled biogeochemistry will be positioned at half this depth.
call update_depth(CENTER)
! If longitude and latitude are used, make sure they have been provided and are valid.
if (swr_method==0) then
if (latitude==invalid_latitude) then
......@@ -259,7 +259,7 @@
stop 'init_run'
end if
end if
! Configure the time module to use actual start and stop dates.
timefmt = 2
......@@ -699,7 +699,7 @@
current_depth = 0.0_rk
par = par_sf
case (BOTTOM)
current_depth = column_depth
current_depth = column_depth
par = par_bt
case (CENTER)
current_depth = 0.5_rk*column_depth
......
......@@ -94,7 +94,7 @@
FATAL 'run.nml: "output_file" must be set to a valid file path in "output" namelist.'
stop 'configure_output'
end if
return
93 FATAL 'run.nml: I could not read the "output" namelist.'
......@@ -410,7 +410,7 @@
end subroutine do_output
!EOC
#ifdef NETCDF4
subroutine check_err(iret)
use netcdf
......
......@@ -15,7 +15,7 @@
use fabm_types
implicit none
private
public get_environment_metadata, get_couplings, get_suitable_masters
......@@ -30,7 +30,7 @@
integer :: n
type (type_link), pointer :: link
! Get number of environmental dependencies (light, temperature, etc.)
n = 0
link => model%links_postcoupling%first
......@@ -44,14 +44,14 @@
case (domain_scalar)
if (.not.associated(model%environment%data_scalar(link%target%read_indices%pointers(1)%p)%p)) n = n+1
end select
end if
end if
link => link%next
end do
! Allocate arrays to hold information on environment
allocate(environment_names(n))
allocate(environment_units(n))
! Get metadata on environmental dependencies (light, temperature, etc.)
n = 0
link => model%links_postcoupling%first
......
......@@ -265,7 +265,7 @@
type (type_link),pointer :: link_slave
integer :: i
link_slave => coupling_link_list%first
do i=2,index
link_slave => link_slave%next
......@@ -307,7 +307,7 @@
type (type_link_list),pointer :: list
type (type_link), pointer :: link
integer :: i
call c_f_pointer(plist, list)
link => list%first
do i=2,index
......@@ -321,7 +321,7 @@
type (c_ptr), intent(in), value :: plist
type (type_link_list),pointer :: list
call c_f_pointer(plist, list)
call list%finalize()
deallocate(list)
......@@ -336,7 +336,7 @@
type (type_internal_variable),pointer :: variable
class (type_base_model), pointer :: owner
character(len=attribute_length) :: long_name_
call c_f_pointer(pvariable, variable)
long_name_ = variable%long_name
owner => variable%owner
......@@ -403,7 +403,7 @@
value = model%surface_state_variables(index)%initial_value
call fabm_link_surface_state_data(model,index,value)
end subroutine
subroutine link_bottom_state_data(index,value) bind(c)
!DIR$ ATTRIBUTES DLLEXPORT :: link_bottom_state_data
integer(c_int),intent(in), value :: index
......@@ -570,7 +570,7 @@
character(kind=c_char),target,intent(in) :: name(*),value(*)
character(len=attribute_length),pointer :: pname,pvalue
call c_f_pointer(c_loc(name), pname)
call c_f_pointer(c_loc(value), pvalue)
call forced_parameters%set_string(pname(:index(pname,C_NULL_CHAR)-1),pvalue(:index(pname,C_NULL_CHAR)-1))
......@@ -622,7 +622,7 @@
do i=1,n
cstring(i) = string(i:i)
end do
cstring(n+1) = C_NULL_CHAR
cstring(n+1) = C_NULL_CHAR
end subroutine
end module fabm_python
......
......@@ -186,9 +186,9 @@
! Arrays with names of variables read by one or more biogeochemical models.
! These are not used within FABM, but may be accessed by the host to determine the names of
! potential forcing variables.
character(len=attribute_length),allocatable,dimension(:) :: dependencies
character(len=attribute_length),allocatable,dimension(:) :: dependencies_hz
character(len=attribute_length),allocatable,dimension(:) :: dependencies_scalar
character(len=attribute_length),allocatable,dimension(:) :: dependencies
character(len=attribute_length),allocatable,dimension(:) :: dependencies_hz
character(len=attribute_length),allocatable,dimension(:) :: dependencies_scalar
integer :: extinction_index = -1
type (type_model_list) :: extinction_call_list
......@@ -534,7 +534,7 @@
filter = .true.
#endif
end select
! If FABM handles this expression internally, remove it from the list.
next => current%next
if (filter) then
......@@ -2223,7 +2223,7 @@ end subroutine internal_check_horizontal_state
end do
end do
end if
end subroutine fabm_do_surface
!EOC
......@@ -2858,8 +2858,8 @@ recursive subroutine set_diagnostic_indices(self)
link => link%next
end do
allocate(self%reused_diag_write_indices(n))
allocate(self%reused_diag_read_indices(n))
allocate(self%reused_diag_write_indices(n))
allocate(self%reused_diag_read_indices(n))
allocate(self%reused_diag_hz_write_indices(n_hz))
allocate(self%reused_diag_hz_read_indices(n_hz))
......@@ -2971,7 +2971,7 @@ subroutine classify_variables(self)
class is (type_weighted_sum)
consvar%sum => model
end select
end if
end if
! Store pointer to model that computes total of conserved quantity at surface + bottom, so we can force recomputation.
model => self%root%find_model(trim(aggregate_variable%standard_variable%name)//'_at_interfaces_calculator')
......@@ -2980,7 +2980,7 @@ subroutine classify_variables(self)
class is (type_horizontal_weighted_sum)
consvar%horizontal_sum => model
end select
end if
end if
aggregate_variable => aggregate_variable%next
end do
......@@ -3267,7 +3267,7 @@ end subroutine
object => self%root%find_object(variable_name)
if (.not.object%write_indices%is_empty()) call find_dependencies(object%owner,list)
end subroutine create_model_call_list
end subroutine create_model_call_list
end module fabm
......
......@@ -2,13 +2,13 @@
module fabm_builtin_models
use fabm_types
implicit none
private
public type_weighted_sum,type_horizontal_weighted_sum,type_simple_depth_integral
type type_component
character(len=attribute_length) :: name = ''
real(rk) :: weight = 1._rk
......@@ -279,7 +279,7 @@ contains
subroutine horizontal_weighted_sum_evaluate_horizontal(self,_ARGUMENTS_HZ_)
class (type_horizontal_weighted_sum),intent(in) :: self
_DECLARE_ARGUMENTS_HZ_
type (type_horizontal_component),pointer :: component
real(rk) :: value
real(rk) _DIMENSION_HORIZONTAL_SLICE_AUTOMATIC_ :: sum
......@@ -305,7 +305,7 @@ contains
_DECLARE_ARGUMENTS_DO_BOTTOM_
call self%evaluate_horizontal(_ARGUMENTS_HZ_)
end subroutine
subroutine simple_depth_integral_initialize(self,configunit)
class (type_simple_depth_integral),intent(inout),target :: self
integer, intent(in) :: configunit
......
......@@ -6,7 +6,7 @@ module fabm_coupling
use fabm_driver
implicit none
private
public freeze_model_info, get_aggregate_variable, find_dependencies
......
......@@ -21,7 +21,7 @@ module fabm_expressions
integer :: ioldest = -1
integer,pointer :: in => null()
real(rk),allocatable _DIMENSION_GLOBAL_PLUS_1_ :: history
real(rk),allocatable _DIMENSION_GLOBAL_PLUS_1_ :: history
end type
type,extends(type_horizontal_expression) :: type_horizontal_temporal_mean
......@@ -31,7 +31,7 @@ module fabm_expressions
integer :: ioldest = -1
integer,pointer :: in => null()
real(rk),allocatable _DIMENSION_GLOBAL_HORIZONTAL_PLUS_1_ :: history
real(rk),allocatable _DIMENSION_GLOBAL_HORIZONTAL_PLUS_1_ :: history
end type
type,extends(type_horizontal_expression) :: type_vertical_integral
......
......@@ -24,7 +24,7 @@
! dependency in the zooplankton model, and linking that at run-time to the phytoplankton model.
! The zooplankton model can then directly query the variables of the prey model (e.g., total carbon),
! and subsequently apply a specific loss rate to all of the prey model's state variables.
module fabm_particle
use fabm_types
......@@ -204,7 +204,7 @@ module fabm_particle
coupling => coupling%next
end do
end subroutine
subroutine build_state_id_list(self)
class (type_particle_model),intent(inout) :: self
......
......@@ -127,7 +127,7 @@ contains
typecode = typecode_string
class default
typecode = typecode_unknown
end select
end select
end function
function to_real(property,success,default) result(value)
......@@ -216,21 +216,21 @@ contains
end select
end function
function string_lower(string) result (lowerstring)
character(len=*),intent(in) :: string
character(len=len(string)) :: lowerstring
function string_lower(string) result (lowerstring)
character(len=*),intent(in) :: string
character(len=len(string)) :: lowerstring
integer :: i,k
lowerstring = string
do i = 1,len(string)
k = iachar(string(i:i))
if (k>=iachar('A').and.k<=iachar('Z')) then
k = k + iachar('a') - iachar('A')
lowerstring(i:i) = achar(k)
end if
end do
end function string_lower
lowerstring = string
do i = 1,len(string)
k = iachar(string(i:i))
if (k>=iachar('A').and.k<=iachar('Z')) then
k = k + iachar('a') - iachar('A')
lowerstring(i:i) = achar(k)
end if
end do
end function string_lower
function compare_keys(dictionary,key1,key2) result(equal)
class (type_property_dictionary),intent(in) :: dictionary
......@@ -370,7 +370,7 @@ contains
logical :: value
class (type_property),pointer :: property
value = default
property => dictionary%get_property(name)
if (.not.associated(property)) return
......@@ -384,7 +384,7 @@ contains
integer :: value
class (type_property),pointer :: property
value = default
property => dictionary%get_property(name)
if (.not.associated(property)) return
......@@ -412,7 +412,7 @@ contains
character(len=value_string_length) :: value
class (type_property),pointer :: property
value = default
property => dictionary%get_property(name)
if (.not.associated(property)) return
......@@ -669,7 +669,7 @@ contains
class (type_hierarchical_dictionary), intent(in), target :: self
class (type_hierarchical_dictionary), intent(inout) :: child
character(len=*), intent(in) :: name
child%parent => self
child%name = name
end subroutine hierarchical_dictionary_add_child
......
......@@ -1828,7 +1828,7 @@ end subroutine real_pointer_set_set_value
call self%register_surface_state_dependency(id, name, '', name)
call self%request_coupling(id,name)
end subroutine
subroutine register_standard_bulk_dependency(model,id,standard_variable,required)
class (type_base_model), intent(inout) :: model
type (type_dependency_id), intent(inout),target :: id
......@@ -2251,7 +2251,7 @@ end subroutine get_string_parameter
nullify(object)
link => self%find_link(name,recursive,exact)
if (associated(link)) object => link%target
end function find_object
function find_link(self,name,recursive,exact) result(link)
......
......@@ -3,7 +3,7 @@
!-----------------------------------------------------------------------
!BOP
!
! fabm_prey_pred --- a simple example of biological interaction between
! fabm_prey_pred --- a simple example of biological interaction between
! two conponents.based on http://www.scholarpedia.org/article/Predator-prey_model
! and adapted for FABM,implemented by Fenjuan Hu(Joint PhD stududent of
! Southern Denmark University&Aarhus university),instructed by Karsten Bolding July,2013.
......
......@@ -11,7 +11,7 @@
!
! !USES:
use fabm_types
implicit none
! default: all is private.
......@@ -48,7 +48,7 @@
integer :: number
real(rk) :: minimum,maximum,value
namelist /examples_duplicator/ model,number,configfile,parameter,minimum,maximum
integer :: i
character(len=64) :: instancename
class (type_base_model),pointer :: childmodel
......
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