Concrete branch ready for testing

[HarryvL]

I am kind off shy to ask, but I do this to update the local femconcrete branch:

Code: Select all

git pull -X theirs https://github.com/berndhahnebach/FreeCAD_bhb femconcrete
git add .
git commit

I have no idea what it does under the hood, but I have now lost the reinforced material icon, so suspect I didn't pull the right branch?!

[HarryvL]

I am kind off shy to ask, but I do this to update the local femconcrete branch:

Code: Select all

git pull -X theirs https://github.com/berndhahnebach/FreeCAD_bhb femconcrete
git add .
git commit

I have no idea what it does under the hood, but I have now lost the reinforced material icon, so suspect I didn't pull the right branch?!

BLAST !! I was on the wrong local branch again. Now I get the new pretty icon for reinforced material

However ... I run into trouble with Calculix. The solver control has changed???? The directory is blank and when I provide one and run Calculix I get the black screen of death:

Screenshot from 2019-06-15 12-39-28.png (175.76 KiB) Viewed 1287 times

OS: Ubuntu 16.04.5 LTS (Unity/ubuntu)
Word size of OS: 64-bit
Word size of FreeCAD: 64-bit
Version: 0.19.17019 (Git)
Build type: Unknown
Branch: (HEAD detached from 3f02550)
Hash: 4f46a03d722d8ae25787a05c9aaddfdf988908f2
Python version: 2.7.12
Qt version: 4.8.7
Coin version: 4.0.0a
OCC version: 7.1.0
Locale: English/UnitedStates (en_US)

[HarryvL]

Trying again, it becomes even more interesting. Have a look at the calculation progress screen.

STEP 1 ??

"Data points in all amplitudes" ??

What type of calculation have I unknowingly triggered here? Should I review the INP file?

Screenshot from 2019-06-15 12-43-37.png (168.98 KiB) Viewed 1284 times

[HarryvL]

At first glance nothing wrong with the INP or FCStd files:

FEMMeshGmshinp.txt

(52.94 KiB) Downloaded 31 times

Wall_2D_BHB.FCStd

(49.43 KiB) Downloaded 32 times

[Jee-Bee]

Nice to see some progress Only pity is i'll never use concrete

[bernd]

"Data points in all amplitudes" ??

might be because of this https://forum.freecadweb.org/viewtopic. ... 10#p314611 open the dat file. You will find the sum of reaction forces.It is a great control of load sum.

[bernd]

Either use git clone myfemconcrete branch into a new git repo or add my repo as remote to your repo and use git fetch to fetch my changes.

Which of both do you prefere?

[HarryvL]

"Data points in all amplitudes" ??

might be because of this https://forum.freecadweb.org/viewtopic. ... 10#p314611 open the dat file. You will find the sum of reaction forces.It is a great control of load sum.

only on femconcrete, or on master too?

That's a good addition, but is it a bug or should I change some of my input to make it work? Currently FC freezes at the end of an CCX analysis.

[HarryvL]

Either use git clone myfemconcrete branch into a new git repo or add my repo as remote to your repo and use git fetch to fetch my changes.

Which of both do you prefere?

Thanks I already cloned your branch in the past. I just want to get your latest updates and compile them. So I went to the local copy of your branch and tried pull from your branch hoping the changes would be automatically merged. This led to many conflicts that couldn't be merged automatically. So then I tried again with git pull -X theirs to automatically accept your modifications. That wasn't possible because I had un-merged changes. So I did add . and commit to get rid of that and pulled again with pull -X theirs. I am just shooting from the hip not knowing what I am doing - very frustrating.

Anyway, what I want is simply pulling and compiling your updates regularly without any need to make my own changes. So basically a pull with automatic merge

[bernd]

merging femconcrete branch will not work! You will have merge konflicts any time you give it try (I am not 100% sure but I assume you will). Why? It is because I rebase the branch with FreeCAD master regularly. When I am one a computer I will try to write down some workflow.