Add more indirect imports

Author: sergisiso

examples/nemo/scripts/omp_cpu_trans.py

@@ -69,19 +69,19 @@
     'par_kind.F90',
 ]
 
-# if not NEMOV4:
-#     FILES_TO_SKIP.extend([
-#         # TODO #3112: These produce diverging run.stat results in NEMOv5 BENCH
-#         "dynhpg.f90",
-#         "dynspg_ts.f90",
-#         "icedyn_rhg_evp.f90",
-#         "icethd_dh.f90",
-#         "icevar.f90",
-#         "iom_nf90.f90",
-#         "sbcssm.f90",
-#         "tramle.f90",
-#         "trazdf.f90",
-#     ])
+if not NEMOV4:
+    FILES_TO_SKIP.extend([
+        # TODO #3112: These produce diverging run.stat results in NEMOv5 BENCH
+        "dynhpg.f90",
+        "dynspg_ts.f90",
+        "icedyn_rhg_evp.f90",
+        "icethd_dh.f90",
+        "icevar.f90",
+        "iom_nf90.f90",
+        "sbcssm.f90",
+        "tramle.f90",
+        "trazdf.f90",
+    ])
 
 if PROFILING_ENABLED:
     # Fails with profiling enabled. issue #2723
@@ -101,6 +101,9 @@ def trans(psyir):
     omp_loop_trans = OMPLoopTrans(omp_schedule="static")
     omp_loop_trans.omp_directive = "paralleldo"
 
+    if psyir.name.startswith("icethd"):
+        return
+
     for subroutine in psyir.walk(Routine):
         print(f"Adding OpenMP threading to subroutine: {subroutine.name}")
 
@@ -126,7 +129,7 @@ def trans(psyir):
                     region_directive_trans=omp_parallel_trans,
                     loop_directive_trans=omp_loop_trans,
                     collapse=False,
-                    # privatise_arrays=(not NEMOV4 and
-                    #                   psyir.name not in PRIVATISATION_ISSUES),
+                    privatise_arrays=(not NEMOV4 and
+                                      psyir.name not in PRIVATISATION_ISSUES),
                     enable_reductions=REPRODUCIBLE,
             )

examples/nemo/scripts/utils.py

@@ -59,6 +59,8 @@
     "bdy_oce", "zdf_oce", "zdfdrg", "ldftra", "crs", "sbcapr", "tideini",
     "ldfdyn", "sbcapr", "sbctide", "zdfgls", "sbcrnf", "sbcisf", "dynldf_iso",
     "stopts", "icb_oce", "domvvl", "sms_pisces", "zdfmfc", "abl", "ice1d",
+    "sed", "p2zlim", "oce_trc", "p4zpoc", "tide_mod", "sbcwave", "isf_oce",
+    "step_oce", "bdyice",
 ]
 
 # Files that PSyclone could process but would reduce the performance.