Commits · 3845e7fb9fe6b6bf1b48a23f526bcfc6c9bce6d8 · Knut Klingbeil / getm

12 Feb, 2019 2 commits
- meteo: only process meteo region required for actual subdomain · 3845e7fb
  Knut authored Feb 12, 2019
  
  3845e7fb
- Merge branch 'bdy_3d' into meteo · 3d4c23d7
  Knut authored Feb 12, 2019
  
  3d4c23d7
18 Jan, 2019 1 commit
- Merge branch 'bdy_2d' into bdy_3d · b0b53e97
  Knut authored Jan 18, 2019
  
  b0b53e97
17 Jan, 2019 1 commit
- bdy_2d: fixed bdy isolated bdy cells · 45df881f
  Knut authored Jan 17, 2019
  
  45df881f
07 Jan, 2019 5 commits
- Merge branch 'bdy_3d' into meteo · d4a07e29
  Knut authored Jan 07, 2019
```
Conflicts:
	src/CMakeLists.txt
```
  d4a07e29
- Merge branch 'bdy_2d' into bdy_3d · db7c11b6
  Knut authored Jan 07, 2019
```
Conflicts:
	src/3d/vertical_coordinates.F90
	src/getm/register_all_variables.F90
```
  db7c11b6
- Merge branch 'bottfric' into bdy_2d · 798c0c13
  Knut authored Jan 07, 2019
  
  798c0c13
- Merge branch 'gvc' into bottfric · f506bbdd
  Knut authored Jan 07, 2019
  
  f506bbdd
- Merge branch 'numerical_analyses' into gvc · bb9a0625
  Knut authored Jan 07, 2019
```
Conflicts:
	src/3d/vertical_coordinates.F90
	src/getm/register_all_variables.F90
```
  bb9a0625
06 Jan, 2019 11 commits
- Merge branch 'ss_nn_MUDFLAT' into numerical_analyses · b17c4f28
  Knut authored Jan 06, 2019
```
Conflicts:
	src/2d/variables_2d.F90
	src/3d/getm_fabm.F90
	src/getm/initialise.F90
	src/getm/register_all_variables.F90
```
  b17c4f28
- Merge branch 'cfl' into ss_nn_MUDFLAT · aeb8af72
  Knut authored Jan 06, 2019
  
  aeb8af72
- Merge branch 'save_fluxes' into cfl · 87c13f85
  Knut authored Jan 06, 2019
  
  87c13f85
- Merge branch 'hvel' into save_fluxes · 5e6cc882
  Knut authored Jan 06, 2019
```
Conflicts:
	src/getm/register_all_variables.F90
```
  5e6cc882
- Merge branch 'depth_update' into hvel · 3a5c3024
  Knut authored Jan 06, 2019
```
Conflicts:
	src/3d/coordinates.F90
	src/3d/dynamic_declarations_3d.h
```
  3a5c3024
- Merge branch 'curvilinear' into depth_update · 61d17441
  Knut authored Jan 06, 2019
  
  61d17441
- Merge branch 'coriolis' into curvilinear · f630b75e
  Knut authored Jan 06, 2019
  
  f630b75e
- Merge branch 'grid_type' into coriolis · 46deb246
  Knut authored Jan 06, 2019
  
  46deb246
- Merge branch 'fwf_int' into grid_type · 485f71fc
  Knut authored Jan 06, 2019
  
  485f71fc
- Merge branch 'output' into fwf_int · 54d9cfc0
  Knut authored Jan 06, 2019
  
  54d9cfc0
- output: partial merge of master · 8720d137
  Knut authored Jan 06, 2019
  
  8720d137
06 Dec, 2018 1 commit
- meteo: only calculate dtm1 for METEO_FROMFILE · bd12f8c8
  Knut authored Dec 06, 2018
  
  bd12f8c8
28 Nov, 2018 1 commit
- bottfric: -D_SLR_V26_ default again; semi-implicit treatment available with -D_SLR_NOCLIP_ · 4fcdf7ac
  Knut authored Nov 28, 2018
  
  4fcdf7ac
15 Nov, 2018 2 commits
- meteo: additional initialisation of arrays · 00a68661
  Knut authored Nov 15, 2018
  
  00a68661
- Merge branch 'bdy_3d' into meteo · d31cca01
  Knut authored Nov 15, 2018
  
  d31cca01
30 Oct, 2018 1 commit
- bdy_3d: REAL_4B => REALTYPE · defcee7a
  Knut authored Oct 30, 2018
  
  defcee7a
28 Oct, 2018 15 commits
- meteo: correct branch name · 8d9f48fe
  Knut authored Oct 28, 2018
  
  8d9f48fe
- Merge branch 'bdy_3d' into meteo · 1daab60b
  Knut authored Oct 28, 2018
  
  1daab60b
- bdy_3d: correct branch name · 8d3773a3
  Knut authored Oct 28, 2018
  
  8d3773a3
- Merge branch 'bdy_2d' into bdy_3d · a81dbd5f
  Knut authored Oct 28, 2018
  
  a81dbd5f
- bdy_2d: correct branch name · 61f7a9a8
  Knut authored Oct 28, 2018
  
  61f7a9a8
- Merge branch 'bottfric' into bdy_2d · d145b944
  Knut authored Oct 28, 2018
```
Conflicts:
	src/getm/main.F90
```
  d145b944
- bottfric: correct branch name · bbaf9f2e
  Knut authored Oct 28, 2018
  
  bbaf9f2e
- Merge branch 'gvc' into bottfric · dab1b944
  Knut authored Oct 28, 2018
```
Conflicts:
	src/getm/main.F90
```
  dab1b944
- gvc: correct branch name · 2ca5afcd
  Knut authored Oct 28, 2018
  
  2ca5afcd
- Merge branch 'numerical_analyses' into gvc · 1a62baf5
  Knut authored Oct 28, 2018
  
  1a62baf5
- numerical_analyses: correct branch name · 7e68adb1
  Knut authored Oct 28, 2018
  
  7e68adb1
- Merge branch 'ss_nn_MUDFLAT' into numerical_analyses · 27fa70f6
  Knut authored Oct 28, 2018
  
  27fa70f6
- ss_nn_MUDFLAT: correct branch name · cebee253
  Knut authored Oct 28, 2018
  
  cebee253
- Merge branch 'cfl' into ss_nn_MUDFLAT · 85833d1e
  Knut authored Oct 28, 2018
```
Conflicts:
	src/getm/main.F90
```
  85833d1e
- cfl: correct branch name · 5e2745a2
  Knut authored Oct 28, 2018
  
  5e2745a2