drop is_part_of_state procedure in favor of part_of_state member variable

Author: jornbr

src/c/fabm_c.F90

@@ -467,11 +467,11 @@ function get_variable_part_of_state(pmodel, category, index) bind(c) result(part
 
       select case (category)
       case (INTERIOR_DIAGNOSTIC_VARIABLE)
-         part_of_state = logical2int(model%p%is_part_of_state(model%p%interior_diagnostic_variables(index)))
+         part_of_state = logical2int(model%p%interior_diagnostic_variables(index)%part_of_state)
       case (HORIZONTAL_DIAGNOSTIC_VARIABLE)
-         part_of_state = logical2int(model%p%is_part_of_state(model%p%horizontal_diagnostic_variables(index)))
+         part_of_state = logical2int(model%p%horizontal_diagnostic_variables(index)%part_of_state)
       case (SCALAR_DIAGNOSTIC_VARIABLE)
-         part_of_state = logical2int(model%p%is_part_of_state(model%p%scalar_diagnostic_variables(index)))
+         part_of_state = logical2int(model%p%scalar_diagnostic_variables(index)%part_of_state)
       end select
    end function get_variable_part_of_state
 

src/fabm.F90

@@ -419,7 +419,6 @@ module fabm
       generic :: variable_needs_values => interior_variable_needs_values, interior_variable_needs_values_sn, &
                                           horizontal_variable_needs_values, horizontal_variable_needs_values_sn, &
                                           scalar_variable_needs_values, scalar_variable_needs_values_sn
-      procedure :: is_part_of_state
       !> @}
       ! ---------------------------------------------------------------------------------------------------------------------------
       procedure :: process_job
@@ -946,13 +945,13 @@ subroutine start(self)
       self%status = status_start_done
 
       do ivar = 1, size(self%interior_diagnostic_variables)
-         self%interior_diagnostic_variables(ivar)%part_of_state = self%is_part_of_state(self%interior_diagnostic_variables(ivar))
+         self%interior_diagnostic_variables(ivar)%part_of_state = self%interior_diagnostic_variables(ivar)%target%part_of_state
       end do
       do ivar = 1, size(self%horizontal_diagnostic_variables)
-         self%horizontal_diagnostic_variables(ivar)%part_of_state = self%is_part_of_state(self%horizontal_diagnostic_variables(ivar))
+         self%horizontal_diagnostic_variables(ivar)%part_of_state = self%horizontal_diagnostic_variables(ivar)%target%part_of_state
       end do
       do ivar = 1, size(self%scalar_diagnostic_variables)
-         self%scalar_diagnostic_variables(ivar)%part_of_state = self%is_part_of_state(self%scalar_diagnostic_variables(ivar))
+         self%scalar_diagnostic_variables(ivar)%part_of_state = self%scalar_diagnostic_variables(ivar)%target%part_of_state
       end do
 
    contains
@@ -1645,17 +1644,6 @@ function get_scalar_data(self, id) result(dat)
       if (id%variable%catalog_index /= -1) dat => self%catalog%scalar(id%variable%catalog_index)%p
    end function get_scalar_data
 
-   ! ------------------------------------------------------------------------------------------------------------------------------
-   !> Returns whether this variable is part of the model state
-   ! ------------------------------------------------------------------------------------------------------------------------------
-   logical function is_part_of_state(self, variable)
-      class (type_fabm_model),               intent(in) :: self
-      class (type_fabm_diagnostic_variable), intent(in) :: variable   !< diagnostic variable
-
-      _ASSERT_(self%status >= status_start_done, 'is_part_of_state', 'This routine can only be called after model start.')
-      is_part_of_state = variable%target%part_of_state
-   end function is_part_of_state
-
    ! ------------------------------------------------------------------------------------------------------------------------------
    !> Initialize all interior state variables
    ! ------------------------------------------------------------------------------------------------------------------------------