Recommendation for installing a minor update

[d.brands]

Dear all,

is there a recommendation how to install a minor update of FEAP, e.g. 8.6.1k -> 8.6.1n?
We have made modifications in some core routines of FEAP for our own developments. So a simple copy over and recompile would certainly not make sense.

At this point also the question whether there is a git repository from which one could always pull the latest updates? Then we could keep our own developments as a separate branch and incorporate the updates through a merge.

Thanks
Dominik

[Prof. S. Govindjee]

We do keep a git-repo for the code but it is not public.  If you want, I can create a git diff ver861k..ver861n which I think you can they use with git apply.  Would that work for you?  If so, let me know and I will post it to the download site.

[d.brands]

Yes, I hope so. Please provide me the diff.

Have you ever worked with git apply and give me a hint on how to do it?

[JStorm]

I also integrate the minor updates after checking which files are modified via diff.
However, this requires some additional settings for the diff to ignore the changes in the copyright lines of the files.
With that setting you can identify the files, which are really modified and compare it to your modified files.

[Prof. S. Govindjee]

I posted the v8.6.1k to v8.6.1n patch to the download site.
To use put it in $FEAPHOME8_6 and then run

Code: [Select]

git apply v861k-to-v861n.patch
I tested this by checking out the v8.6.1k source, then running the command, followed by a diff to v8.6.1n.

I also did the same using patch

Code: [Select]

patch -p1 < v861k-to-v861n.patchand that seemed to work too, even though I have read that this is supposed to have trouble with with renames and deletes.

[Prof. S. Govindjee]

How this plays out with modified source, I do not know.  Make a test copy of your source! before proceeding.

[d.brands]

Dear Sanjay,

just to be on the safe side. At the end of the patch file I read

@@ -29,6 +29,7 @@
 !      11.  Version 8.6.1k                                  24/10/2021
 !      12.  Version 8.6.1l                                  01/01/2022
 !      13.  Version 8.6.1m                                  03/02/2022
+!      14.  Version 8.6.1n                                  14/02/2022
 !-----[--.----+----.----+----.-----------------------------------------]
 
 !     Finite Element Analysis Program - (FEAP)  for solution of general
@@ -121,8 +122,8 @@
 
 !-----[--.----+----.----+----.-----------------------------------------]
 !     Set version header for output to file and screen
-      versn(1) = 'Release 8.6.1m'
-      versn(2) = '03 February 2022'
+      versn(1) = 'Release 8.6.1n'
+      versn(2) = '14 February 2022'
 
 !-----[--.----+----.----+----.-----------------------------------------]
 !     Set ratio for real to integer variables: Set ipr = 1 or 2

I interpret this as if the diff was made from version 8.6.1m to version 8.6.1n.

Can you check this?

Thanks
Dominik

[Prof. S. Govindjee]

There were unreleased minor version between k and n.  That is why you see l and m in the patch file.  If you grep for "Version 8.6.1l", for example, you will see there is also a patch for when that was added, likewise for "Version 8.6.1m". 
The file contains a temporal record of all the checked in patches between k and n.

[d.brands]

Perfect. Thanks for clarification.