(closes #1618) Use PSyIR reader for the LFRic algorithm layer

examples/lfric/eg11/helmholtz_solver_alg_mod.x90

@@ -49,6 +49,7 @@ module helmholtz_solver_alg_mod
 
     use field_mod, only : field_type
     use operator_mod, only : operator_type
+    use constants_mod, only : r_def
     use scaled_matrix_vector_kernel_mod, only: opt_scaled_matrix_vector_kernel_type
 
     implicit none

examples/lfric/eg4/solver_mod.x90

@@ -87,7 +87,7 @@ module solver_mod
   end type example_type
 
   private
-  public :: solver_algorithm
+  public :: jacobi_solver_algorithm
 
 contains
 
@@ -129,7 +129,6 @@ subroutine jacobi_solver_algorithm(lhs, rhs, mm, mesh, n_iter)
 
   diagonal = field_type( vector_space = rhs_fs )
   res      = field_type( vector_space = rhs_fs )
-  res2     = field_type( vector_space = rhs_fs )
 
   call invoke( mm_diagonal_kernel_type(diagonal, mm), &
                X_divideby_Y(lhs, rhs, diagonal),      &

examples/lfric/eg6/alg.x90

@@ -49,6 +49,8 @@ contains
   subroutine example(precond_option, mmd)
 
     use precondition_mod, only : precondition
+    use constants_mod, only : r_def, i_def
+    use field_mod, only : field_type
 
     implicit none
 

examples/lfric/eg7/alg.x90

@@ -48,6 +48,7 @@ module alg
   use field_mod,                         only : field_type
   use operator_mod,                      only : operator_type
   use columnwise_operator_mod,           only : columnwise_operator_type
+  use constants_mod,                     only : r_def
 
 contains
 

examples/lfric/eg8/helmholtz_solver_alg_mod.x90

@@ -45,6 +45,7 @@ module helmholtz_solver_alg_mod
 
   use field_mod,                 only: field_type
   use constants_mod,             only: i_def, r_def
+  use timestepping_config_mod,   only: tau_t
 
   type(field_type) :: hb_inv
   type(field_type), private :: grad_p

examples/lfric/eg9/advective_inc_alg_mod.x90

@@ -64,6 +64,9 @@ module advective_inc_alg_mod
   use operator_mod,                   only: operator_type
   use quadrature_xyoz_mod,            only: quadrature_xyoz_type
   use quadrature_rule_gaussian_mod,   only: quadrature_rule_gaussian_type
+  use quadrature_face_mod,            only: quadrature_face_type
+  use other,                          only: reference_element, chi_stencil_extent
+
 
   ! PsyKAl PSYClone kernels
   use rtheta_bd_kernel_mod,           only: rtheta_bd_kernel_type

src/psyclone/core/symbolic_maths.py

@@ -118,8 +118,12 @@ def equal(exp1, exp2, identical_variables=None):
         if exp1 is None or exp2 is None:
             return exp1 == exp2
 
-        diff = SymbolicMaths._subtract(exp1, exp2,
-                                       identical_variables=identical_variables)
+        try:
+            diff = SymbolicMaths._subtract(
+                exp1, exp2, identical_variables=identical_variables)
+        except Exception:
+            return False
+
         # For ranges all values (start, stop, step) must be equal, meaning
         # each index of the difference must evaluate to 0:
         if isinstance(diff, list):