Merge pull request #85 from sandialabs/main

Merge main back into develop

Author: Matthew-Whitlock

include/fenix.h

@@ -546,8 +546,8 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
                               int max_count, int time_stamp, Fenix_Data_subset* found_data);
 
 //!@unimplemented As #Fenix_Data_member_restore, but restores from a specific rank's data.
-int Fenix_Data_member_restore_from_rank(int member_id, void *data, int max_count,
-                                        int time_stamp, int group_id,
+int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *data,
+                                        int max_count, int time_stamp, int group_id,
                                         int source_rank);
 
 /**

src/fenix.c

@@ -138,7 +138,7 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
     return __fenix_member_lrestore(group_id, member_id, target_buffer, max_count, time_stamp, data_found);
 }
 
-int Fenix_Data_member_resore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, int source_rank) {
+int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, int source_rank) {
     return 0;
 }
 

src/fenix_process_recovery.c

@@ -876,12 +876,6 @@ void __fenix_test_MPI(MPI_Comm *pcomm, int *pret, ...)
         }
         return;
         break;
-#ifdef MPICH
-        MPIX_Comm_revoke(*fenix.world);
-        MPIX_Comm_revoke(fenix.new_world);
-        //MPIX_Comm_revoke(*fenix.user_world);
-        fenix.repair_result = __fenix_repair_ranks();
-#endif
     }