Adjust the bdy_lyr local script, and housekeeping

applications/lfric_atm/build/psyclone_transmute_file_list.mk

@@ -16,7 +16,6 @@
 
 export PSYCLONE_PHYSICS_FILES = \
                                 bl_lsp \
-                                bl_diags_mod \
                                 bm_tau_kernel_mod \
                                 btq_int \
                                 conv_gr_kernel_mod \

applications/lfric_atm/optimisation/meto-ex1a/transmute/boundary_layer/kmkhz_9c_wtrac.py

@@ -50,8 +50,7 @@ def trans(psyir):
     for node in psyir.walk(Routine):
         loop_replacement_of(node, "j")
 
-    # Span a parallel section across the whole routine,
-    # apart for a few exceptions provided
+    # Place a parallel do around loops
     for loop in psyir.walk(Loop):
         loop_ancestor_type = ""
         try:

applications/lfric_atm/optimisation/meto-ex1a/transmute/boundary_layer/local.py

@@ -27,13 +27,14 @@
     Routine,
     Loop,
     OMPParallelDirective,
+    IfBlock,
+    Reference,
 )
 from psyclone.transformations import (TransformationError)
 from transmute_psytrans.transmute_functions import (
     loop_replacement_of,
     get_compiler,
     first_priv_red_init,
-    remove_unspanable_nodes,
     set_pure_subroutines,
     replace_n_threads,
     OMP_PARALLEL_REGION_TRANS,
@@ -53,7 +54,6 @@
     "i": {"variable": "i"}})  # For bdy_impl3.F90
 
 
-# Longer term we will raise some of these into a override import, see Apps#900
 # pylint: disable=too-many-locals
 # pylint: disable=too-many-statements
 # pylint: disable=too-many-branches
@@ -130,18 +130,80 @@ def trans(psyir):
 
     # Span a parallel section across the whole routine,
     # apart for a few exceptions provided
-    for routine in psyir.walk(Routine):
-        routine_children = remove_unspanable_nodes(
-            routine,
-            timer_routine_names,
-            loop_type_init
-        )
-        # Span the region across filtered down node list
-        try:
-            OMP_PARALLEL_REGION_TRANS.apply(
-                routine_children)
-        except (TransformationError, IndexError) as err:
-            logging.warning("OMPParallelTrans failed: %s", err)
+    for routine in psyir.walk(Routine): #pylint: disable=R1702
+        # Get the list of children of the routine
+        routine_children = routine.children
+        # Default reference for start_node
+        start_node = None
+        # Work through the routine's children from the start.
+        for index, routine_child in enumerate(routine_children):
+            # When the first loop or if block is found,
+            # place it as the start reference index.
+            if isinstance(routine_child, Loop): #pylint: disable=R1723
+                start_node = index
+                break
+            elif isinstance(routine_child, IfBlock):
+                # Often timing handles are placed inside if blocks,
+                # check if it is not a known timing call, which should be
+                # ignored for spanning a parallel section.
+                for routine_grandchild in routine_child.walk(Reference):
+                    # In case the node does not have a name property
+                    # else PSyclone could crash
+                    try:
+                        if str(routine_grandchild.name) in timer_routine_names:
+                            # Start node remains None.
+                            start_node = None
+                            break
+                        else:
+                            # Set the start node to the index and keep checking
+                            # grandchildren for calls that invalidate.
+                            # If all are valid, start_node still equals index.
+                            start_node = index
+                    except ValueError:  # noqa: E722
+                        continue
+                # Now check if we have a satisfactory start node.
+                if start_node is not None:
+                    break
+            else:
+                continue
+
+        # Default reference for end_node
+        end_node = None
+        for index in range((len(routine_children)-1), 0, -1):
+            # Like above, work backwards through the routine's children.
+            if isinstance(routine_children[index], Loop): #pylint: disable=R1723
+                end_node = index + 1
+                break
+            elif isinstance(routine_children[index], IfBlock):
+                for routine_grandchild in \
+                        routine_children[index].walk(Reference):
+                    # In case the node does not have a name property
+                    # else PSyclone could crash
+                    try:
+                        if str(routine_grandchild.name) in timer_routine_names:
+                            # End node remains None.
+                            end_node = None
+                            break
+                        else:
+                            # Set the end node to the index and keep checking
+                            # grandchildren for calls that invalidate.
+                            # If all are valid, end_node still equals index + 1.
+                            end_node = index + 1
+                    except ValueError:  # noqa: E722
+                        continue
+                # Now check if we have a satisfactory start node.
+                if end_node is not None:
+                    break
+            else:
+                continue
+
+
+        if start_node and end_node:
+            try:
+                OMP_PARALLEL_REGION_TRANS.apply(
+                    routine_children[start_node:end_node])
+            except (TransformationError, IndexError) as err:
+                logging.warning("OMPParallelTrans failed: %s", err)
 
     # CCE first private issue with 3.1, to be removed longer term
     if get_compiler() == "cce" and first_private_list:

applications/lfric_atm/optimisation/meto-ex1a/transmute/boundary_layer/script_options.py

@@ -38,15 +38,7 @@
         "ignore_dependencies_for": [
             "bl_diag%grad_t_adj"
             ]
-        },
-    "first_private_list": [
-        "f2_fqw",
-        "f2_ftl",
-        "fsc_fqw",
-        "fsc_ftl",
-        "non_grad_fqw",
-        "non_grad_ftl"
-        ]
+        }
 }
 
 SCRIPT_OPTIONS_DICT["ex_flux_uv"+str(FILE_EXTEN)] = {
@@ -65,56 +57,7 @@
             "surf_dep_flux",
             "gamma_rhokh_rdz"
             ]
-        },
-    "first_private_list": [
-        "dfield_inv",
-        "dz_disc",
-        "dzlkp1",
-        "f_field_ent",
-        "km1"
-        ]
-}
-
-SCRIPT_OPTIONS_DICT["bdy_impl3"+str(FILE_EXTEN)] = {
-    "options": {
-        "ignore_dependencies_for": [
-            "dtl1_1",
-            "ct_prod",
-            "dqw1_1",
-            "dqw",
-            "dtl",
-            "ct_ctq",
-            "temp",
-            "dqw1",
-            "dtl1",
-            "ctctq1"
-            ]
-        },
-    "safe_pure_calls": [
-        "oneover_v"
-        ],
-    "max_threads_parse": True,
-    "loop_type_init": [
-        "max_threads",
-        "blm1",
-        "tdims_omp_block",
-        "tdims_seg_block"
-        ]
-}
-
-SCRIPT_OPTIONS_DICT["bdy_impl4"+str(FILE_EXTEN)] = {
-    "options": {
-        "ignore_dependencies_for": [
-            "tl",
-            "qw",
-            "dtl",
-            "dqw"
-            ]
-        },
-    "loop_type_init": [
-        "tdims_omp_block",
-        "tdims_seg_block"
-        ]
+        }
 }
 
 SCRIPT_OPTIONS_DICT["imp_mix"+str(FILE_EXTEN)] = {
@@ -129,12 +72,6 @@
             ]
         },
     "max_threads_parse": True,
-    "loop_type_init": [
-        "max_threads",
-        "blm1",
-        "pdims_omp_block",
-        "pdims_seg_block"
-        ]
 }
 
 SCRIPT_OPTIONS_DICT["fm_drag"+str(FILE_EXTEN)] = {
@@ -161,5 +98,3 @@
         "wtb"
         ]
 }
-
-# ## Other boundary layer options ##

applications/ngarch/build/psyclone_transmute_file_list.mk

@@ -16,7 +16,6 @@
 
 export PSYCLONE_PHYSICS_FILES = \
                                 bl_lsp \
-                                bl_diags_mod \
                                 bm_tau_kernel_mod \
                                 btq_int \
                                 conv_gr_kernel_mod \