Commits · 078795214dd7ec94d6739c4b7eaf0925e4877f92 · Knut Klingbeil / getm

19 Feb, 2019 14 commits
- Merge branch 'gvc' into bottfric · 07879521
  Knut authored Feb 19, 2019
  
  07879521
- Merge branch 'numerical_analyses' into gvc · 0c9a9fc9
  Knut authored Feb 19, 2019
  
  0c9a9fc9
- numerical_analyses: bugfix after merge · 6edc43c9
  Knut authored Feb 19, 2019
  
  6edc43c9
- Merge branch 'ss_nn_MUDFLAT' into numerical_analyses · 898196e7
  Knut authored Feb 19, 2019
```
Conflicts:
	src/getm/register_all_variables.F90
```
  898196e7
- Merge branch 'cfl' into ss_nn_MUDFLAT · 8177ee59
  Knut authored Feb 19, 2019
  
  8177ee59
- Merge branch 'save_fluxes' into cfl · ffae6bf4
  Knut authored Feb 19, 2019
  
  ffae6bf4
- Merge branch 'hvel' into save_fluxes · 43892b63
  Knut authored Feb 19, 2019
  
  43892b63
- Merge branch 'depth_update' into hvel · c7b69aae
  Knut authored Feb 19, 2019
  
  c7b69aae
- Merge branch 'curvilinear' into depth_update · 3f41c152
  Knut authored Feb 19, 2019
```
Conflicts:
	src/2d/variables_2d.F90
```
  3f41c152
- Merge branch 'coriolis' into curvilinear · 97f26a81
  Knut authored Feb 19, 2019
  
  97f26a81
- Merge branch 'grid_type' into coriolis · 21aef1a2
  Knut authored Feb 19, 2019
  
  21aef1a2
- Merge branch 'fwf_int' into grid_type · 9504c4c4
  Knut authored Feb 19, 2019
  
  9504c4c4
- Merge branch 'master' into fwf_int · 97080a47
  Knut authored Feb 19, 2019
  
  97080a47
- smarter flexout of staggered velocities · d89df3d8
  Knut authored Feb 19, 2019
  
  d89df3d8
11 Jan, 2019 6 commits
- Merge branch 'output' into fwf_int · 79accb58
  Knut authored Jan 11, 2019
  
  79accb58
- output: removed redundant register_variables_meteo() after merge · 290c332b
  Knut authored Jan 11, 2019
  
  290c332b
- Merge branch 'master' into output · 22466b0d
  Knut authored Jan 11, 2019
  
  22466b0d
- finished integration of flexible output · ea8effdc
  Knut authored Jan 11, 2019
  
  ea8effdc
- output: some common use of rk · dc33a76d
  Knut authored Jan 11, 2019
  
  dc33a76d
- output: 0.5 => _HALF_ · 9ec37d9a
  Knut authored Jan 11, 2019
  
  9ec37d9a
07 Jan, 2019 2 commits
- 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
03 Jan, 2019 2 commits
- coordinates: 0.5 --> _HALF_ · 311b280d
  Karsten Bolding authored Jan 03, 2019
  
  311b280d
- added global field for z-coordinates of cell centers · 4f88eaf2
  Karsten Bolding authored Jan 03, 2019
  
  4f88eaf2
06 Dec, 2018 1 commit
- some bug-fixes for compilation · dd418859
  Knut authored Dec 06, 2018
  
  dd418859
05 Dec, 2018 4 commits
- output.F90 updated according to output branch (?) · 89524b80
  Karsten Bolding authored Dec 05, 2018
  
  89524b80
- only select vertical codinates if runtype .ge. 2 · 83deb1fd
  Karsten Bolding authored Dec 05, 2018
  
  83deb1fd
- getm_timers(): output --> do_output · f0e9791b
  Karsten Bolding authored Dec 05, 2018
  
  f0e9791b
- first hack at timing flexible output · edf8d8e0
  Karsten Bolding authored Dec 05, 2018
  
  edf8d8e0