Merge branch 'master' into sink_20190723

This commit is contained in:
Miikka Vaisala
2019-08-07 10:46:23 +08:00
24 changed files with 849 additions and 437 deletions

View File

@@ -30,7 +30,7 @@
#define LMAGNETIC (1)
#define LENTROPY (1)
#define LTEMPERATURE (0)
#define LFORCING (0)
#define LFORCING (1)
#define LUPWD (0)
#define LSINK (1)