Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

OpenSource
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2314e4cc

Commit 2314e4cc authored 6 years ago by Joeri Brackenhoff

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/JanThorbecke/OpenSource

parents f7a17924 62d6aeb4

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

extrap3d/lib/dataFileIO.c 63 additions, 28 deletions

extrap3d/lib/dataFileIO.c
extrap3d/main/cfpmod3d.c 5 additions, 3 deletions

extrap3d/main/cfpmod3d.c
extrap3d/main/extrap3d.c 5 additions, 3 deletions

extrap3d/main/extrap3d.c
extrap3d/main/zomodel3d.c 7 additions, 4 deletions

extrap3d/main/zomodel3d.c
fdelmodc/Makefile 2 additions, 1 deletion

fdelmodc/Makefile
fdelmodc/demo/fdelmodc_doublecouple.scr 4 additions, 4 deletions

fdelmodc/demo/fdelmodc_doublecouple.scr
fdelmodc/demo/modelOilGas.scr 5 additions, 3 deletions

fdelmodc/demo/modelOilGas.scr
fdelmodc/demo/staal.scr 20 additions, 0 deletions

fdelmodc/demo/staal.scr
fdelmodc/elastic4dc.c 160 additions, 0 deletions

fdelmodc/elastic4dc.c
fdelmodc/fdelmodc.c 7 additions, 1 deletion

fdelmodc/fdelmodc.c
fdelmodc/getParameters.c 10 additions, 3 deletions

fdelmodc/getParameters.c
fdelmodc/readModel.c 6 additions, 6 deletions

fdelmodc/readModel.c
marchenko/Makefile 2 additions, 22 deletions

marchenko/Makefile
utils/demo/makemodsmooth.scr 56 additions, 0 deletions

utils/demo/makemodsmooth.scr
utils/makemod.c 1 addition, 0 deletions

utils/makemod.c

with 353 additions and 78 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment