Code

Saltflux option for CICE#799

Code

Merged

apcraig merged 24 commits intoCICE-Consortium:mainCICE-Consortium/CICE:mainfrom ESCOMP:cesm_updates2ESCOMP/CICE:cesm_updates2Copy head branch name to clipboardDec 7, 2022

+126-50

Commits

Commits on Oct 24, 2022

• Bring Consortium main into CESM

  dabail10

  committed
  c489483

  Copy full SHA for c489483

• Comment out OMP initialization

  dabail10

  committed
  9db5da4

  Copy full SHA for 9db5da4

Commits on Nov 8, 2022

• Update wave-ice coupling in NUOPC/CMEPS driver

  dabail10

  committed
  490b259

  Copy full SHA for 490b259

Commits on Nov 30, 2022

• Update to Consortium main

  dabail10

  committed
  0d23ccd

  Copy full SHA for 0d23ccd

• Update saltflux option to be constant and use ice_ref_salinity

  dabail10

  committed
  675670d

  Copy full SHA for 675670d

• Fix a couple inconsistencies with CICE Consortium master

  dabail10

  committed
  758d2ac

  Copy full SHA for 758d2ac

• Fix some issues

  dabail10

  committed
  853b6ec

  Copy full SHA for 853b6ec

• Fix some merge issues

  dabail10

  committed
  df51c68

  Copy full SHA for df51c68

• Fix some merge issues

  dabail10

  committed
  b13b728

  Copy full SHA for b13b728

• Fix ACC directive

  dabail10

  committed
  9bb0281

  Copy full SHA for 9bb0281

• Bug fixes with eap initialization

  dabail10

  committed
  33ea462

  Copy full SHA for 33ea462

• Fix evp initialization

  dabail10

  committed
  842d5c6

  Copy full SHA for 842d5c6

Commits on Dec 1, 2022

• Add warning when ktherm=1 and saltflux_option not constant

  dabail10

  committed
  fbf9d59

  Copy full SHA for fbf9d59

• Comment out Tair initialization

  dabail10

  committed
  d88e71e

  Copy full SHA for d88e71e

• Add CESMCOUPLED around OMP initialization

  dabail10

  committed
  ba6fe8a

  Copy full SHA for ba6fe8a

• CESM File unit handling

  dabail10

  committed
  71cf0fb

  Copy full SHA for 71cf0fb

Commits on Dec 2, 2022

• Change icepack hash for PR

  dabail10

  committed
  df5573f

  Copy full SHA for df5573f

• Some cleanup things

  dabail10

  committed
  4f8cf7e

  Copy full SHA for 4f8cf7e

• Move nu_diag_set to CESMCOUPLED region

  dabail10

  committed
  8b1c232

  Copy full SHA for 8b1c232

• Put Tair initialization in a CESMCOUPLED

  dabail10

  committed
  f19faa7

  Copy full SHA for f19faa7

Commits on Dec 5, 2022

• New saltflux tests

  dabail10

  committed
  3363e83

  Copy full SHA for 3363e83

Commits on Dec 6, 2022

• Update icepack for saltflux option

  dabail10

  committed
  34dbeed

  Copy full SHA for 34dbeed

• Update icepack

  dabail10

  committed
  6201214

  Copy full SHA for 6201214

• Merge branch 'main' of https://github.com/ESCOMP/CICE into cesm_updates2

  dabail10

  committed
  38103c5

  Copy full SHA for 38103c5