Commits · 34_INPUT_DIR · Knut Klingbeil / getm

19 Feb, 2019 36 commits
- Merge branch 'STDERR_DIR' into INPUT_DIR · abe17357
  Knut authored Feb 19, 2019
  
  abe17357
- Merge branch 'slice_model' into STDERR_DIR · 2464b326
  Knut authored Feb 19, 2019
  
  2464b326
- Merge branch 'nonnegsalt' into slice_model · ed84ee66
  Knut authored Feb 19, 2019
  
  ed84ee66
- Merge branch 'use_gotm' into nonnegsalt · b68fa145
  Knut authored Feb 19, 2019
  
  b68fa145
- Merge branch 'parameters_nml' into use_gotm · ed9e3588
  Knut authored Feb 19, 2019
  
  ed9e3588
- Merge branch 'coupling' into parameters_nml · bcb7d550
  Knut authored Feb 19, 2019
  
  bcb7d550
- Merge branch 'fabm' into coupling · 17c1cc91
  Knut authored Feb 19, 2019
  
  17c1cc91
- Merge branch 'bioshade' into fabm · 375d190e
  Knut authored Feb 19, 2019
  
  375d190e
- Merge branch 'daf' into bioshade · a7d1095b
  Knut authored Feb 19, 2019
  
  a7d1095b
- Merge branch 'waves' into daf · c1df21ee
  Knut authored Feb 19, 2019
  
  c1df21ee
- Merge branch 'postinit' into waves · fe6d52dd
  Knut authored Feb 19, 2019
```
Conflicts:
	src/2d/bdy_2d.F90
	src/2d/variables_2d.F90
```
  fe6d52dd
- Merge branch 'nonhyd_sep' into postinit · 9e917582
  Knut authored Feb 19, 2019
```
Conflicts:
	src/3d/variables_3d.F90
	src/getm/initialise.F90
```
  9e917582
- Merge branch 'nonhyd' into nonhyd_sep · ab9d36a5
  Knut authored Feb 19, 2019
  
  ab9d36a5
- Merge branch 'adv' into nonhyd · efbaa7db
  Knut authored Feb 19, 2019
  
  efbaa7db
- Merge branch 'ip' into adv · f926c1f1
  Knut authored Feb 19, 2019
  
  f926c1f1
- Merge branch 'les' into ip · 42a3984d
  Knut authored Feb 19, 2019
  
  42a3984d
- Merge branch 'rigid_lid' into les · ea94a2c0
  Knut authored Feb 19, 2019
  
  ea94a2c0
- Merge branch 'rivers' into rigid_lid · 61cae53c
  Knut authored Feb 19, 2019
  
  61cae53c
- Merge branch 'meteo' into rivers · 64419727
  Knut authored Feb 19, 2019
  
  64419727
- Merge branch 'bdy_3d' into meteo · ac9bdb2b
  Knut authored Feb 19, 2019
```
Conflicts:
	src/3d/salinity.F90
	src/3d/temperature.F90
```
  ac9bdb2b
- Merge branch 'bdy_2d' into bdy_3d · 85a1971d
  Knut authored Feb 19, 2019
  
  85a1971d
- Merge branch 'bottfric' into bdy_2d · 3d326362
  Knut authored Feb 19, 2019
```
Conflicts:
	src/2d/variables_2d.F90
```
  3d326362
- 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
14 Feb, 2019 1 commit
- coupling: cleaning after ESMF bugfix for gridAlign · 3a7ea17d
  Knut authored Feb 14, 2019
  
  3a7ea17d
12 Feb, 2019 3 commits
- meteo: flip_var() · bf6fc715
  Knut authored Feb 12, 2019
  
  bf6fc715
- 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