Code

Sync develop into master#233

Code

Merged

sdrabenh merged 9 commits intomasterGEOS-ESM/GEOSgcm_GridComp:masterfrom developGEOS-ESM/GEOSgcm_GridComp:developCopy head branch name to clipboardMar 9, 2020

+222-83

Commits

Commits on Mar 3, 2020

• Merge pull request #222 from GEOS-ESM/master

  Show description for af87343
  mathomp4

  authored
  af87343

  Copy full SHA for af87343

Commits on Mar 4, 2020

• Fixed "zero-diff" issue related to GF evaporation vs total rain, fixed GF cloud-mass-flux scaling issue

  sdrabenh

  committed
  2bf03ab

  Copy full SHA for 2bf03ab

• Merge pull request #223 from GEOS-ESM/feature/sdrabenh/gf1_fix

  Show description for a854477
  sdrabenh

  authored
  a854477

  Copy full SHA for a854477

Commits on Mar 5, 2020

• Move ShallowCu contribution to mass flux. Add scale-dependent stochastics to convection.

  sdrabenh

  committed
  f413830

  Copy full SHA for f413830

Commits on Mar 6, 2020

• Correct MAX_RL setting in 1-moment code

  sdrabenh

  committed
  120e5e8

  Copy full SHA for 120e5e8

Commits on Mar 9, 2020

• Fix for GNU for if(integer)

  Show description for 64143c2
  mathomp4

  authored
  64143c2

  Copy full SHA for 64143c2

• Lost a space

  mathomp4

  authored
  9c93436

  Copy full SHA for 9c93436

• Merge pull request #231 from GEOS-ESM/mathomp4-patch-1

  Show description for ac2ff77
  sdrabenh

  authored
  ac2ff77

  Copy full SHA for ac2ff77

• Merge pull request #230 from GEOS-ESM/feature/sdrabenh/GFDL_stoch_CNV_MF

  Show description for de08f7e
  sdrabenh

  authored
  de08f7e

  Copy full SHA for de08f7e