fix usage of preprocessor define conflicting with the coverage analysis

scripts/errors/pt2pt/InvalidComm.py

@@ -74,14 +74,16 @@ class InvalidCommErrorP2P(ErrorGenerator):
 
                 if comm_to_use in self.missmatching_comms and comm_to_use != "MPI_COMM_SELF":
                     comm_var_name = get_communicator(comm_to_use, tm)
-                    # use precprcessor to make this two identifieres same
-                    # alternatively, chang the arg in the MPI call to teh result variable name
-                    tm.insert_instruction(Instruction("#define " + comm_to_use + " " + comm_var_name),
-                                          before_instruction=0)
+                    #  change the arg in the MPI call to the result variable name
+                    for call in tm.get_instruction(identifier="MPICALL", return_list=True):
+                        if call.get_arg("comm") == comm_to_use:
+                            call.set_arg("comm", comm_var_name)
+
                 if comm_to_use in self.intercomms:
                     comm_var_name = get_intercomm(comm_to_use, tm)
-                    tm.insert_instruction(Instruction("#define " + comm_to_use + " " + comm_var_name),
-                                          before_instruction=0)
+                    for call in tm.get_instruction(identifier="MPICALL", return_list=True):
+                        if call.get_arg("comm") == comm_to_use:
+                            call.set_arg("comm", comm_var_name)
 
                 # if intercomm: set rank to 0 instead of 1 as ther is only one rank in intercomm
                 if comm_to_use in self.intercomms and not comm_to_use == "mpi_intercomm_merge":