Commits · bb9a0625e8946aeff2e2f8b7d1ba6c8fc211e7e3 · Knut Klingbeil / getm

07 Jan, 2019 1 commit
- 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
28 Oct, 2018 24 commits
- 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
- Merge branch 'save_fluxes' into cfl · f61a66a5
  Knut authored Oct 28, 2018
  
  f61a66a5
- save_fluxes: correct branch name · 3cb832c1
  Knut authored Oct 28, 2018
  
  3cb832c1
- Merge branch 'hvel' into save_fluxes · 4463b08a
  Knut authored Oct 28, 2018
  
  4463b08a
- hvel: correct branch name · 32085d16
  Knut authored Oct 28, 2018
  
  32085d16
- Merge branch 'depth_update' into hvel · 1a7132b4
  Knut authored Oct 28, 2018
  
  1a7132b4
- depth_update: correct branch name · 06ffc99b
  Knut authored Oct 28, 2018
  
  06ffc99b
- Merge branch 'curvilinear' into depth_update · 3dd5e0a1
  Knut authored Oct 28, 2018
  
  3dd5e0a1
- curvilinear: correct branch name · 0f3141c2
  Knut authored Oct 28, 2018
  
  0f3141c2
- Merge branch 'coriolis' into curvilinear · d07f6ae0
  Knut authored Oct 28, 2018
  
  d07f6ae0
- coriolis: correct branch name · 97ec10c1
  Knut authored Oct 28, 2018
  
  97ec10c1
- Merge branch 'grid_type' into coriolis · 90bac0e7
  Knut authored Oct 28, 2018
```
Conflicts:
	src/getm/main.F90
```
  90bac0e7
- grid_type: correct branch name · b089b3e8
  Knut authored Oct 28, 2018
  
  b089b3e8
- Merge branch 'fwf_int' into grid_type · c733c168
  Knut authored Oct 28, 2018
  
  c733c168
- fwf_int: correct branch name · ac404d18
  Knut authored Oct 28, 2018
  
  ac404d18
- Merge branch 'output' of git://git.code.sf.net/p/getm/code into fwf_int · f71ac9d9
  Knut authored Oct 28, 2018
  
  f71ac9d9
- output: correct branch name · 41c8e035
  Knut authored Oct 28, 2018
  
  41c8e035
- Merge remote-tracking branch 'origin/master' into output · e12c4212
  Knut authored Oct 28, 2018
  
  e12c4212
25 Oct, 2018 1 commit
- print global indices for vertical cfl errors · e6ca1f12
  Knut authored Oct 25, 2018
  
  e6ca1f12
11 Jul, 2018 3 commits
- output: GETM_FLEXIBLE_OUTPUT · 7f0a73bb
  Knut authored Jul 11, 2018
  
  7f0a73bb
- output: log _FLEXIBLE_OUTPUT_ · 5e41be10
  Knut authored Jul 11, 2018
  
  5e41be10
- Merge remote-tracking branch 'origin/master' into output · 4b1909c7
  Knut authored Jul 11, 2018
  
  4b1909c7