Code

Update NUOPC/CMEPS driver#607

Code

Merged

apcraig merged 133 commits intoCICE-Consortium:masterCICE-Consortium/CICE:masterfrom DeniseWorthen:feature/updcap_escomp_scolDeniseWorthen/CICE:feature/updcap_escomp_scolCopy head branch name to clipboardJun 17, 2021

+2,271-1,899

Commits

Commits on Feb 25, 2020

• Merge pull request #1 from CICE-Consortium/master

  DeniseWorthen

  authored
  0338d04

Commits on Mar 7, 2020

• Merge pull request #2 from CICE-Consortium/master

  DeniseWorthen

  authored
  99470ed

Commits on Apr 2, 2020

• Merge pull request NOAA-EMC#3 from CICE-Consortium/master

  DeniseWorthen

  authored
  71d2ded

Commits on Apr 22, 2020

• merge latest master (NOAA-EMC#4)

  Show description for d46d691
  

  4 peopleauthored
  d46d691

Commits on Apr 23, 2020

• updated orbital calculations needed for cesm

  

  Mariana Vertenstein

  committed
  183218a

Commits on Apr 29, 2020

• fixed problems in updated orbital calculations needed for cesm

  

  Mariana Vertenstein

  committed
  10e7c20

Commits on May 10, 2020

• update CICE6 to support coupling with UFS

  apcraig

  committed
  ce8e5a9

• Merge pull request #2 from apcraig/ufs01

  Show description for 8f0b5ee
  dabail10

  authored
  8f0b5ee

Commits on May 12, 2020

• Merge pull request #1 from ESCOMP/nuopc

  DeniseWorthen

  authored
  7ac0e3d

Commits on May 19, 2020

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  80c9e6e

Commits on May 25, 2020

• put in changes so that both ufsatm and cesm requirements for potential temperature and density are satisfied

  

  Mariana Vertenstein

  committed
  53715ea

Commits on May 26, 2020

• Merge pull request NOAA-EMC#3 from mvertens/mvertens/nuopc

  Show description for 7e43703
  dabail10

  authored
  7e43703

Commits on Jun 2, 2020

• Merge remote-tracking branch 'upstream/master'

  DeniseWorthen

  committed
  397e588

Commits on Jun 5, 2020

• Convergence on ustar for CICE. (CICE-Consortium#452) (NOAA-EMC#5)

  Show description for 3bb3694
  

  DeniseWorthen

  and

  dabail10

  authored
  3bb3694

Commits on Jun 22, 2020

• Merge remote-tracking branch 'upstream/nuopc' into HEAD

  DeniseWorthen

  committed
  f41f1e9

• update icepack submodule

  DeniseWorthen

  committed
  e70d1ab

• Revert "update icepack submodule"

  Show description for 308a1d4
  DeniseWorthen

  committed
  308a1d4

Commits on Jun 24, 2020

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  7848fdf

Commits on Jun 25, 2020

• Merge remote-tracking branch 'upstream/nuopc' into HEAD

  DeniseWorthen

  committed
  6982ee4

• update comp_ice.backend with temporary ice_timers fix

  DeniseWorthen

  committed
  089f60f

Commits on Jun 29, 2020

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  6affdcf

Commits on Jul 1, 2020

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  b5a6058

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

  dabail10

  committed
  415df0e

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  b4da8a6

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

  dabail10

  committed
  239c7de

• Fix threading problem in init_bgc

  dabail10

  committed
  ad03424

• Fix additional OMP problems

  dabail10

  committed
  73e7774

Commits on Jul 2, 2020

• changes for coldstart running

  DeniseWorthen

  committed
  46fcfba

• Move the forapps directory

  dabail10

  committed
  c762336

• remove cesmcoupled ifdefs

  DeniseWorthen

  committed
  6bccf71

• Fix logging issues for NUOPC

  dabail10

  committed
  902e883

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

  dabail10

  committed
  178693a

Commits on Jul 4, 2020

• removal of many cpp-ifdefs

  

  Mariana Vertenstein

  committed
  b4afd2e

• fix compile errors

  DeniseWorthen

  committed
  3a1b88b

• fixes to get cesm working

  

  Mariana Vertenstein

  committed
  41855fd

• update to latest nuopc changes

  

  Mariana Vertenstein

  committed
  aea1aa8

Commits on Jul 6, 2020

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  e4c989c

Commits on Jul 7, 2020

• fixed white space issue

  

  Mariana Vertenstein

  committed
  30a81cc

• Merge pull request NOAA-EMC#4 from mvertens/nuopc

  Show description for 8ebdda9
  dabail10

  authored
  8ebdda9

• Add restart_coszen namelist option

  dabail10

  committed
  27dd3b7

• Merge remote-tracking branch 'upstream/master'

  DeniseWorthen

  committed
  50bf856

• Merge branch 'nuopc' into coszen

  dabail10

  authored
  6b4a277

• Merge pull request NOAA-EMC#5 from ESCOMP/coszen

  Show description for 93f0e86
  dabail10

  authored
  93f0e86

• update icepack submodule

  DeniseWorthen

  committed
  f92bef3

• Merge remote-tracking branch 'upstream/nuopc' into emc/develop

  DeniseWorthen

  committed
  4e8cc79

• change Orion to orion in backend

  Show description for 8ff4ee0
  DeniseWorthen

  committed
  8ff4ee0

Commits on Jul 9, 2020

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  7211bc1

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

  dabail10

  committed
  148ab08

Commits on Jul 14, 2020

• add -link_mpi=dbg to debug flags (NOAA-EMC#8)

  DeniseWorthen

  authored
  916c6af

Commits on Jul 15, 2020

• Merge remote-tracking branch 'CICE-Consortium/master' into emc/develop

  DeniseWorthen

  committed
  9bdb9ad

• Update NUOPC cap to work with latest CICE6 master

  dabail10

  committed
  aa9ef50

Commits on Jul 17, 2020

• cice6 compile (NOAA-EMC#6)

  Show description for 8f37bfc
  MinsukJi-NOAA

  authored
  8f37bfc

• Merge remote-tracking branch 'upstream/emc/develop' into HEAD

  DeniseWorthen

  committed
  86b8dab

• Merge remote-tracking branch 'upstream/master' into emc/develop

  DeniseWorthen

  committed
  c084de4

Commits on Jul 28, 2020

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  793e7ce

Commits on Aug 5, 2020

• Merge remote-tracking branch 'upstream/master' into emc/develop

  DeniseWorthen

  committed
  88cc2fd

• nuopc,cmeps or s2s build updates

  DeniseWorthen

  committed
  7fc1c30

Commits on Aug 6, 2020

• fixes for dbug_flag

  DeniseWorthen

  committed
  1802396

Commits on Aug 10, 2020

• Merge pull request NOAA-EMC#6 from DeniseWorthen/escomp/nuopc

  Show description for 964c860
  dabail10

  authored
  964c860

• Update nuopc2 to latest CICE master

  dabail10

  committed
  1cf95cf

• Merge latest CICE master

  dabail10

  committed
  adbff47

• Fix some merge problems

  dabail10

  committed
  b52362e

• Fix dbug variable

  dabail10

  committed
  f106591

Commits on Aug 12, 2020

• Manual merge of UFS changes

  dabail10

  committed
  64c5569

• Merge pull request NOAA-EMC#7 from ESCOMP/nuopc2

  Show description for f6040e1
  dabail10

  authored
  f6040e1

• changes for consistency w/ current emc-cice5 (NOAA-EMC#13)

  Show description for bdf1a1f
  

  6 peopleauthored
  bdf1a1f

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  5ecde75

Commits on Aug 13, 2020

• Fixcommit (NOAA-EMC#14)

  Show description for d81a834
  DeniseWorthen

  authored
  d81a834

• Merge remote-tracking branch 'upstream/master' into emc/develop

  DeniseWorthen

  committed
  4d7ba5b

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  5dcfca8

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

  dabail10

  committed
  5a0c13d

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  3e4d1e7

Commits on Aug 31, 2020

• Update CICE6 for integration to S2S

  Show description for 285985c
  DeniseWorthen

  authored
  285985c

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  6d30789

• Merge remote-tracking branch 'consortium/master' into emc/develop

  DeniseWorthen

  committed
  8129aab

Commits on Oct 4, 2020

• fixes to get CESM B1850 compset working

  

  Mariana Vertenstein

  committed
  c360dc2

Commits on Oct 5, 2020

• refactored ice_prescribed_mod.F90 to work with cdeps rather than the mct data models

  

  Mariana Vertenstein

  committed
  1a32f3e

Commits on Oct 8, 2020

• Support TACC stampede (NOAA-EMC#19)

  MinsukJi-NOAA

  authored
  ac617cd

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  23cdee7

Commits on Oct 30, 2020

• update icepack

  DeniseWorthen

  committed
  1e4f42b

• Merge remote-tracking branch 'consortium/master' into feature/updcice

  DeniseWorthen

  committed
  2515f77

• add ice_dyn_vp module to CICE_InitMod

  DeniseWorthen

  committed
  41afe74

Commits on Nov 10, 2020

• update gitmodules, update icepack

  DeniseWorthen

  committed
  2a0f332

• Update CICE to consortium master (NOAA-EMC#23)

  Show description for f773ef3
  DeniseWorthen

  authored
  f773ef3

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  840e931

Commits on Jan 26, 2021

• Fix use_restart_time

  dabail10

  committed
  e48dd38

Commits on Jan 28, 2021

• changes for creating masks at runtime

  

  Mariana Vertenstein

  committed
  f59b5c3

Commits on Jan 29, 2021

• added ice_mesh_mod

  

  Mariana Vertenstein

  committed
  66356cb

Commits on Feb 1, 2021

• implemented area correction factors as option

  

  Mariana Vertenstein

  committed
  6ff987c

• more cleanup

  

  Mariana Vertenstein

  committed
  0f90ce1

Commits on Mar 14, 2021

• Merge remote-tracking branch 'upstream/emc/develop' into feature/updcice

  DeniseWorthen

  committed
  1e4d393

• Merge remote-tracking branch 'Consortium/master' into feature/updcice

  DeniseWorthen

  committed
  66546ae

Commits on Mar 22, 2021

• Fix dragio

  dabail10

  committed
  d78c3a3

• Merge pull request NOAA-EMC#8 from ESCOMP/mvertens/nuopc_updates

  Show description for 1139e7f
  dabail10

  authored
  1139e7f

• Fix mushy bug

  dabail10

  committed
  68132e7

Commits on Mar 24, 2021

• updates to nuopc cap to resolve inconsistency between driver inputs and cice namelists

  

  Mariana Vertenstein

  committed
  ff3783a

• changed error message

  

  Mariana Vertenstein

  committed
  718a75d

• added icepack_warnings_flush

  

  Mariana Vertenstein

  committed
  3ee6fe2

Commits on Apr 5, 2021

• update icepack

  DeniseWorthen

  committed
  2eca569

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  b52e91c

Commits on Apr 26, 2021

• updates to get ice categories working

  

  Mariana Vertenstein

  committed
  3bdc07b

Commits on May 4, 2021

• updates to have F compset almost working with cice6 - still problems in polar regions - need to resolve 253K/cice6 versus 273K/cice5 differences

  

  Mariana Vertenstein

  committed
  508e9b9

Commits on May 6, 2021

• changed tolerance of mesh/grid comparison

  

  Mariana Vertenstein

  committed
  a2ddbd9

Commits on May 10, 2021

• added issues raised in PR

  

  Mariana Vertenstein

  committed
  56e1a83

Commits on Jun 1, 2021

• Merge remote-tracking branch 'Consortium/master' into feature/updcice

  DeniseWorthen

  committed
  51db2f9

• add escomp/nuopc cap updates

  DeniseWorthen

  committed
  3348230

Commits on Jun 2, 2021

• Merge pull request NOAA-EMC#9 from ESCOMP/nuopc_updates

  Show description for 8b5ac3a
  dabail10

  authored
  8b5ac3a

Commits on Jun 3, 2021

• update ice_mesh_check

  Show description for a468b00
  DeniseWorthen

  committed
  a468b00

• fix whitespace and blank line

  DeniseWorthen

  committed
  f29ab1b

• switch to no-abort icepack branch

  DeniseWorthen

  committed
  4d3cc8d

Commits on Jun 4, 2021

• Update CICE to latest Consortium master (NOAA-EMC#26)

  Show description for 519d339
  DeniseWorthen

  authored
  519d339

Commits on Jun 5, 2021

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  74e7b58

• update icepack

  DeniseWorthen

  committed
  bf548bd

• manually merge nuopc updates

  Show description for ed3ef8d
  DeniseWorthen

  committed
  ed3ef8d

Commits on Jun 6, 2021

• fix compile error for ufs-weather

  Show description for b7f7b17
  DeniseWorthen

  committed
  b7f7b17

• fixes for ufs-weather

  Show description for 5eea430
  DeniseWorthen

  committed
  5eea430

• remove unrequired lines

  DeniseWorthen

  committed
  a8b9c77

Commits on Jun 7, 2021

• Merge branch 'master' of https://github.com/CICE-Consortium/CICE into nuopc

  dabail10

  committed
  82d5d51

• Merge CICE Consortium main to nuopc

  dabail10

  committed
  6faa645

Commits on Jun 9, 2021

• add cice changes for zlvs

  Show description for 70b5ec7
  DeniseWorthen

  committed
  70b5ec7

Commits on Jun 10, 2021

• Merge branch 'emc/develop' into feature/updcap_escomp_scol

  DeniseWorthen

  committed
  1355928

• Merge branch 'bugfix/initzlvs' into feature/updcap_escomp_scol

  DeniseWorthen

  committed
  c8e43fb

• Merge remote-tracking branch 'Consortium/master' into feature/updcap_escomp_scol

  DeniseWorthen

  committed
  d55da5b

• remove ufs/comp_ice.backend scripts

  DeniseWorthen

  committed
  7f34d46

• Merge remote-tracking branch 'escomp/nuopc' into feature/updcap_escomp_scol

  DeniseWorthen

  committed
  b628606

• point submodule for icepack to consortium/icepack

  DeniseWorthen

  committed
  3d94c9e

• add cice changes for zlvs (NOAA-EMC#29)

  DeniseWorthen

  authored
  9d88d92

Commits on Jun 11, 2021

• Merge remote-tracking branch 'upstream/emc/develop' into feature/updcap_escomp_scol

  DeniseWorthen

  committed
  aa11007

• resolve white space differences

  DeniseWorthen

  committed
  a0f83fe

• Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

  DeniseWorthen

  committed
  d1f2d15

• Merge branch 'emc/develop' into feature/updcap_escomp_scol

  DeniseWorthen

  committed
  d09c4ce

Commits on Jun 15, 2021

• revert removal of 'latlon' grid_type

  DeniseWorthen

  committed
  1900861

Commits on Jun 16, 2021

• remove extraneous call to calendar in CICE_RunMod

  Show description for 9df592e
  DeniseWorthen

  committed
  9df592e