Skip to content

Commit

Permalink
Remove dates from patch files
Browse files Browse the repository at this point in the history
  • Loading branch information
ljacobson64 committed May 21, 2024
1 parent 2796f66 commit 84111cd
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 42 deletions.
20 changes: 10 additions & 10 deletions patch/mcnp514.patch
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
diff -rN '--unified=0' MCNP514/Source/dotcomm/include/dotcomm.h MCNP514/Source_new/dotcomm/include/dotcomm.h
--- MCNP514/Source/dotcomm/include/dotcomm.h 2024-05-21 10:51:09.953041525 -0500
+++ MCNP514/Source_new/dotcomm/include/dotcomm.h 2024-05-21 12:32:38.248472430 -0500
--- MCNP514/Source/dotcomm/include/dotcomm.h
+++ MCNP514/Source_new/dotcomm/include/dotcomm.h
@@ -164 +164 @@
-#define DOTCOMM_Datatype int
+#define DOTCOMM_Datatype MPI_Datatype
@@ -584 +584 @@
- int *datatype,
+ DOTCOMM_Datatype *datatype,
diff -rN '--unified=0' MCNP514/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c 2024-05-21 10:51:09.953041525 -0500
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c 2024-05-21 12:43:29.565181707 -0500
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c
@@ -60,0 +61,2 @@
+ DOTCOMM_Context
+ default_user_context; /* Set to MPI_COMM_WORLD. */
@@ -62 +63,0 @@
- default_user_context, /* Set to MPI_COMM_WORLD. */
diff -rN '--unified=0' MCNP514/Source/dotcomm/src/internals/mpi/dotcommi_pack.c MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommi_pack.c 2024-05-21 10:51:09.953041525 -0500
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c 2024-05-21 12:32:55.121818552 -0500
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommi_pack.c
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c
@@ -60 +60 @@
-void DOTCOMMI_PACK ( const void *pv, int *count, int *datatype, int *ierr)
+void DOTCOMMI_PACK ( const void *pv, int *count, DOTCOMM_Datatype *datatype, int *ierr)
diff -rN '--unified=0' MCNP514/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h 2024-05-21 10:51:09.953041525 -0500
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h 2024-05-21 12:32:43.026643553 -0500
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h
@@ -35 +35 @@
- int dotcommpi_sizeof ( int datatype );
+ int dotcommpi_sizeof ( DOTCOMM_Datatype datatype );
diff -rN '--unified=0' MCNP514/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c 2024-05-21 10:51:09.953041525 -0500
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c 2024-05-21 12:33:01.967401816 -0500
--- MCNP514/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
+++ MCNP514/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
@@ -40 +40 @@
-int dotcommpi_sizeof ( int datatype )
+int dotcommpi_sizeof ( DOTCOMM_Datatype datatype )
Expand Down
20 changes: 10 additions & 10 deletions patch/mcnp515.patch
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
diff -rN '--unified=0' MCNP515/Source/dotcomm/include/dotcomm.h MCNP515/Source_new/dotcomm/include/dotcomm.h
--- MCNP515/Source/dotcomm/include/dotcomm.h 2024-05-21 10:51:09.963041249 -0500
+++ MCNP515/Source_new/dotcomm/include/dotcomm.h 2024-05-21 12:30:15.042477364 -0500
--- MCNP515/Source/dotcomm/include/dotcomm.h
+++ MCNP515/Source_new/dotcomm/include/dotcomm.h
@@ -165 +165 @@
-#define DOTCOMM_Datatype int
+#define DOTCOMM_Datatype MPI_Datatype
@@ -585 +585 @@
- int *datatype,
+ DOTCOMM_Datatype *datatype,
diff -rN '--unified=0' MCNP515/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c 2024-05-21 10:51:09.963041249 -0500
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c 2024-05-21 12:34:01.573964822 -0500
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c
@@ -60,0 +61,2 @@
+ DOTCOMM_Context
+ default_user_context; /* Set to MPI_COMM_WORLD. */
@@ -62 +63,0 @@
- default_user_context, /* Set to MPI_COMM_WORLD. */
diff -rN '--unified=0' MCNP515/Source/dotcomm/src/internals/mpi/dotcommi_pack.c MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommi_pack.c 2024-05-21 10:51:09.963041249 -0500
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c 2024-05-21 12:28:24.652443758 -0500
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommi_pack.c
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c
@@ -60 +60 @@
-void DOTCOMMI_PACK ( const void *pv, int *count, int *datatype, int *ierr)
+void DOTCOMMI_PACK ( const void *pv, int *count, DOTCOMM_Datatype *datatype, int *ierr)
diff -rN '--unified=0' MCNP515/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h 2024-05-21 10:51:09.963041249 -0500
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h 2024-05-21 12:26:26.902105282 -0500
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h
@@ -35 +35 @@
- int dotcommpi_sizeof ( int datatype );
+ int dotcommpi_sizeof ( DOTCOMM_Datatype datatype );
diff -rN '--unified=0' MCNP515/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c 2024-05-21 10:51:09.963041249 -0500
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c 2024-05-21 12:30:22.054918956 -0500
--- MCNP515/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
+++ MCNP515/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
@@ -40 +40 @@
-int dotcommpi_sizeof ( int datatype )
+int dotcommpi_sizeof ( DOTCOMM_Datatype datatype )
Expand Down
20 changes: 10 additions & 10 deletions patch/mcnp516.patch
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
diff -rN '--unified=0' MCNP516/Source/dotcomm/include/dotcomm.h MCNP516/Source_new/dotcomm/include/dotcomm.h
--- MCNP516/Source/dotcomm/include/dotcomm.h 2024-05-21 10:51:09.973040969 -0500
+++ MCNP516/Source_new/dotcomm/include/dotcomm.h 2024-05-21 12:12:36.242680810 -0500
--- MCNP516/Source/dotcomm/include/dotcomm.h
+++ MCNP516/Source_new/dotcomm/include/dotcomm.h
@@ -165 +165 @@
-#define DOTCOMM_Datatype int
+#define DOTCOMM_Datatype MPI_Datatype
@@ -575 +575 @@
- int *datatype,
+ DOTCOMM_Datatype *datatype,
diff -rN '--unified=0' MCNP516/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c 2024-05-21 10:51:09.973040969 -0500
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c 2024-05-21 12:34:20.251806640 -0500
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommi_enroll.c
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommi_enroll.c
@@ -60,0 +61,2 @@
+ DOTCOMM_Context
+ default_user_context; /* Set to MPI_COMM_WORLD. */
@@ -62 +63,0 @@
- default_user_context, /* Set to MPI_COMM_WORLD. */
diff -rN '--unified=0' MCNP516/Source/dotcomm/src/internals/mpi/dotcommi_pack.c MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommi_pack.c 2024-05-21 10:51:09.973040969 -0500
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c 2024-05-21 12:11:35.362584333 -0500
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommi_pack.c
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommi_pack.c
@@ -60 +60 @@
-void DOTCOMMI_PACK ( const void *pv, int *count, int *datatype, int *ierr)
+void DOTCOMMI_PACK ( const void *pv, int *count, DOTCOMM_Datatype *datatype, int *ierr)
diff -rN '--unified=0' MCNP516/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h 2024-05-21 10:51:09.973040969 -0500
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h 2024-05-21 12:09:06.252482057 -0500
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommpi_mpi.h
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommpi_mpi.h
@@ -35 +35 @@
- int dotcommpi_sizeof ( int datatype );
+ int dotcommpi_sizeof ( DOTCOMM_Datatype datatype );
diff -rN '--unified=0' MCNP516/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c 2024-05-21 10:51:09.973040969 -0500
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c 2024-05-21 12:09:08.972441550 -0500
--- MCNP516/Source/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
+++ MCNP516/Source_new/dotcomm/src/internals/mpi/dotcommpi_sizeof.c
@@ -40 +40 @@
-int dotcommpi_sizeof ( int datatype )
+int dotcommpi_sizeof ( DOTCOMM_Datatype datatype )
Expand Down
20 changes: 10 additions & 10 deletions patch/mcnp602.patch
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
diff -rN '--unified=0' MCNP602/Source/dotcomm/dotcomm.h MCNP602/Source_new/dotcomm/dotcomm.h
--- MCNP602/Source/dotcomm/dotcomm.h 2024-05-21 10:51:10.013039879 -0500
+++ MCNP602/Source_new/dotcomm/dotcomm.h 2024-05-21 12:35:22.528118094 -0500
--- MCNP602/Source/dotcomm/dotcomm.h
+++ MCNP602/Source_new/dotcomm/dotcomm.h
@@ -165 +165 @@
-#define DOTCOMM_Datatype int
+#define DOTCOMM_Datatype MPI_Datatype
@@ -575 +575 @@
- int *datatype,
+ DOTCOMM_Datatype *datatype,
diff -rN '--unified=0' MCNP602/Source/dotcomm/dotcommi_enroll.c MCNP602/Source_new/dotcomm/dotcommi_enroll.c
--- MCNP602/Source/dotcomm/dotcommi_enroll.c 2024-05-21 10:51:10.013039879 -0500
+++ MCNP602/Source_new/dotcomm/dotcommi_enroll.c 2024-05-21 12:43:56.866450896 -0500
--- MCNP602/Source/dotcomm/dotcommi_enroll.c
+++ MCNP602/Source_new/dotcomm/dotcommi_enroll.c
@@ -60,0 +61,2 @@
+ DOTCOMM_Context
+ default_user_context; /* Set to MPI_COMM_WORLD. */
@@ -62 +63,0 @@
- default_user_context, /* Set to MPI_COMM_WORLD. */
diff -rN '--unified=0' MCNP602/Source/dotcomm/dotcommi_pack.c MCNP602/Source_new/dotcomm/dotcommi_pack.c
--- MCNP602/Source/dotcomm/dotcommi_pack.c 2024-05-21 10:51:10.013039879 -0500
+++ MCNP602/Source_new/dotcomm/dotcommi_pack.c 2024-05-21 12:37:01.882765177 -0500
--- MCNP602/Source/dotcomm/dotcommi_pack.c
+++ MCNP602/Source_new/dotcomm/dotcommi_pack.c
@@ -60 +60 @@
-void DOTCOMMI_PACK ( const void *pv, int *count, int *datatype, int *ierr)
+void DOTCOMMI_PACK ( const void *pv, int *count, DOTCOMM_Datatype *datatype, int *ierr)
diff -rN '--unified=0' MCNP602/Source/dotcomm/dotcommpi_mpi.h MCNP602/Source_new/dotcomm/dotcommpi_mpi.h
--- MCNP602/Source/dotcomm/dotcommpi_mpi.h 2024-05-21 10:51:10.013039879 -0500
+++ MCNP602/Source_new/dotcomm/dotcommpi_mpi.h 2024-05-21 12:36:19.571863125 -0500
--- MCNP602/Source/dotcomm/dotcommpi_mpi.h
+++ MCNP602/Source_new/dotcomm/dotcommpi_mpi.h
@@ -35 +35 @@
- int dotcommpi_sizeof ( int datatype );
+ int dotcommpi_sizeof ( DOTCOMM_Datatype datatype );
diff -rN '--unified=0' MCNP602/Source/dotcomm/dotcommpi_sizeof.c MCNP602/Source_new/dotcomm/dotcommpi_sizeof.c
--- MCNP602/Source/dotcomm/dotcommpi_sizeof.c 2024-05-21 10:51:10.013039879 -0500
+++ MCNP602/Source_new/dotcomm/dotcommpi_sizeof.c 2024-05-21 12:37:15.046114903 -0500
--- MCNP602/Source/dotcomm/dotcommpi_sizeof.c
+++ MCNP602/Source_new/dotcomm/dotcommpi_sizeof.c
@@ -40 +40 @@
-int dotcommpi_sizeof ( int datatype )
+int dotcommpi_sizeof ( DOTCOMM_Datatype datatype )
Expand Down
6 changes: 4 additions & 2 deletions regenerate_patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ for version in ${versions}; do
diff -rN "--unified=0" ${folder}/Source ${folder}/Source_new > temp
mv ${folder}/Source ${folder}/Source_orig
mv ${folder}/Source_new ${folder}/Source
sed -e "s/.F\t.*/.F/" \
sed -e "s/.inc\t.*/.inc/" \
-e "s/.c\t.*/.c/" \
-e "s/.h\t.*/.h/" \
-e "s/.F\t.*/.F/" \
-e "s/.F90\t.*/.F90/" \
-e "s/.inc\t.*/.inc/" \
temp > patch/${patch}
rm -f temp
done

0 comments on commit 84111cd

Please sign in to comment.