Squashed commit of the following:

commit 2ed3c05
Author: Denise Worthen <[email protected]>
Date:   Thu Sep 7 15:00:21 2023 -0400

    Update CICE from Consortium/main, add run-time and history-write logging (NOAA-EMC#65)

commit d41c61d
Author: Denise Worthen <[email protected]>
Date:   Wed Aug 2 17:09:26 2023 -0400

    Update CICE from Consortium/main (NOAA-EMC#62)

    * Fix CESMCOUPLED compile issue in icepack. (CICE-Consortium#823)
    * Update global reduction implementation to improve performance, fix VP bug (CICE-Consortium#824)
    * Update VP global sum to exclude local implementation with tripole grids
    * Add functionality to change hist_avg for each stream (CICE-Consortium#827)
    * Update Icepack to #6703bc533c968 May 22, 2023 (CICE-Consortium#829)
    * Fix for mesh check in CESM driver (CICE-Consortium#830)
    * Namelist option for time axis position. (CICE-Consortium#839)

commit 5840cd1
Merge: 6671e32 7df80ba
Author: Denise Worthen <[email protected]>
Date:   Wed Mar 22 07:43:35 2023 -0400

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit 6671e32
Merge: ee68d3f d73bb8b
Author: Denise Worthen <[email protected]>
Date:   Tue Mar 7 12:56:52 2023 -0500

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit ee68d3f
Merge: dd25b0f e628a9a
Author: Denise Worthen <[email protected]>
Date:   Tue Mar 7 12:56:33 2023 -0500

    Merge branch 'emc/develop' into feature/updcice

commit e628a9a
Author: Denise Worthen <[email protected]>
Date:   Mon Jan 23 07:58:06 2023 -0500

    Update CICE for latest Consortium/main (NOAA-EMC#56)

commit dd25b0f
Merge: ed472ab 506614d
Author: Denise Worthen <[email protected]>
Date:   Sat Jan 14 12:00:15 2023 -0500

    Merge branch 'test' into feature/updcice

commit 506614d
Merge: 7757945 0bf0fdc
Author: Denise Worthen <[email protected]>
Date:   Sat Jan 14 11:58:19 2023 -0500

    Merge remote-tracking branch 'CICE-Consortium/main' into test

commit ed472ab
Author: denise.worthen <[email protected]>
Date:   Mon Jan 9 12:53:05 2023 +0000

    fix for nudiag_set

    allow nudiag_set to be available outside of cesm; may prefer
    to fix in coupling interface

commit ce2298e
Merge: ad8d577 0bf0fdc
Author: denise.worthen <[email protected]>
Date:   Wed Jan 4 14:50:34 2023 -0500

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit ad8d577
Merge: 90a8b62 b16d7fd
Author: Denise Worthen <[email protected]>
Date:   Tue Dec 6 14:22:06 2022 -0500

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit 90a8b62
Merge: fe16051 7757945
Author: Denise Worthen <[email protected]>
Date:   Tue Dec 6 13:37:51 2022 -0500

    Merge branch 'NOAA-EMC:emc/develop' into feature/updcice

commit 7757945
Author: Denise Worthen <[email protected]>
Date:   Fri Nov 25 08:58:08 2022 -0500

    Update CICE (NOAA-EMC#54)

    * update to include recent PRs to Consortium/main

commit fe16051
Merge: b11bfb4 9808b51
Author: Denise Worthen <[email protected]>
Date:   Wed Nov 16 07:59:58 2022 -0500

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit b11bfb4
Merge: b893ee9 251ca48
Author: Denise Worthen <[email protected]>
Date:   Tue Nov 8 09:07:10 2022 -0500

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit b893ee9
Author: denise.worthen <[email protected]>
Date:   Wed Nov 2 15:45:10 2022 -0600

    add initializationsin ice_state

    * initialize vsnon/vsnon_init and vicen/vicen_init

commit 2e68b9e
Merge: d6d081a 3820cde
Author: Denise Worthen <[email protected]>
Date:   Wed Nov 2 12:14:34 2022 -0400

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit d6d081a
Merge: 1f70caf 968a0ed
Author: Denise Worthen <[email protected]>
Date:   Wed Nov 2 12:13:52 2022 -0400

    Merge branch 'emc/develop' into feature/updcice

commit 968a0ed
Author: Denise Worthen <[email protected]>
Date:   Tue Aug 30 12:51:07 2022 -0400

    Add wave-cice coupling; update to Consortium main (NOAA-EMC#51)

    * add wave-ice fields
    * initialize aicen_init, which turns up as NaN in calc of floediam
    export
    * add call to icepack_init_wave to initialize wavefreq and dwavefreq
    * update to latest consortium main (PR 752)

commit 1f70caf
Merge: 73cc18c fea412a
Author: denise.worthen <[email protected]>
Date:   Sat Aug 20 10:52:22 2022 -0400

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit 73cc18c
Merge: cc0f89c 471c010
Author: denise.worthen <[email protected]>
Date:   Thu Jun 23 17:42:49 2022 -0400

    Merge remote-tracking branch 'Consortium/main' into feature/addCgridfixes

commit cc0f89c
Author: denise.worthen <[email protected]>
Date:   Wed Jun 22 14:13:25 2022 -0600

    remove inserted whitespace for uvelE,N and vvelE,N

commit 9e2dd69
Author: denise.worthen <[email protected]>
Date:   Wed Jun 22 13:07:56 2022 -0600

    respond to review comments

commit 26498db
Author: denise.worthen <[email protected]>
Date:   Mon Jun 20 15:27:46 2022 -0600

    fix debug failure when grid_ice=C

    * compiling in debug mode using -init=snan,arrays requires
    initialization of variables

commit 2d5487a
Author: denise.worthen <[email protected]>
Date:   Mon Jun 13 11:56:40 2022 -0600

    change F->S for ocean velocities and tilts

commit a38df37
Merge: ab95d2d 7705e13
Author: denise.worthen <[email protected]>
Date:   Mon Jun 13 09:34:45 2022 -0400

    Merge remote-tracking branch 'Consortium/main' into feature/addCgridfixes

commit ab95d2d
Merge: cbc6046 c334aee
Author: denise.worthen <[email protected]>
Date:   Thu Jun 2 15:48:31 2022 -0400

    Merge remote-tracking branch 'Consortium/main' into feature/addCgridfixes

commit cbc6046
Author: denise.worthen <[email protected]>
Date:   Mon May 23 19:07:39 2022 -0600

    remove added haloupdates

    * baselines pass with these extra halo updates removed

commit ae50efe
Author: denise.worthen <[email protected]>
Date:   Sun May 22 16:30:00 2022 -0600

    fixes for cgrid repro

commit dd158e2
Author: denise.worthen <[email protected]>
Date:   Sat May 14 13:59:26 2022 +0000

    replace save_init with step_prep in CICE_RunMod

commit 247dc1d
Author: denise.worthen <[email protected]>
Date:   Sat May 14 09:01:12 2022 -0400

    fix comment, fix env for orion and hera

commit 4b28dfe
Merge: c660075 078aab4
Author: denise.worthen <[email protected]>
Date:   Sat May 14 08:58:48 2022 -0400

    Merge remote-tracking branch 'Consortium/main' into feature/addCgrid

commit c660075
Author: Denise Worthen <[email protected]>
Date:   Tue May 10 15:28:44 2022 -0400

    Update CICE to Consortium/main (NOAA-EMC#48)

    Update OpenMP directives as needed including validation via new omp_suite. Fixed OpenMP in dynamics.
    Refactored eap puny/pi lookups to improve scalar performance
    Update Tsfc implementation to make sure land blocks don't set Tsfc to freezing temp
    Update for sea bed stress calculations

commit 27dfd1b
Author: Denise Worthen <[email protected]>
Date:   Thu Feb 24 11:19:10 2022 -0500

    Update CICE to latest Consortium/main (NOAA-EMC#45)

commit 8ff0fb2
Author: denise.worthen <[email protected]>
Date:   Tue Nov 30 05:11:57 2021 -0500

    duplicate gitmodule style for icepack

commit abbebab
Author: denise.worthen <[email protected]>
Date:   Tue Nov 30 05:10:24 2021 -0500

    remove 2 extraneous lines

    * remove two log print lines that were removed prior to
    merge of driver updates to consortium

commit 7a0b65e
Merge: 55bf9f4 8d4a3c6
Author: denise.worthen <[email protected]>
Date:   Mon Nov 29 19:06:29 2021 -0500

    Merge branch 'emc/develop' into feature/updcice

commit 55bf9f4
Merge: d83c67b 2b85126
Author: denise.worthen <[email protected]>
Date:   Mon Nov 29 18:50:34 2021 -0500

    Merge remote-tracking branch 'Consortium/main' into feature/updcice

commit 8d4a3c6
Author: Denise Worthen <[email protected]>
Date:   Mon Nov 22 09:06:56 2021 -0500

    recreate cap update branch (NOAA-EMC#42)

    * add debug_model feature
    * add required variables and calls for tr_snow

commit d83c67b
Merge: 8a88024 d95bd51
Author: Denise Worthen <[email protected]>
Date:   Tue Oct 12 14:16:31 2021 -0400

    Merge branch 'NOAA-EMC:emc/develop' into feature/updcice

commit d95bd51
Author: Denise Worthen <[email protected]>
Date:   Fri Oct 1 09:42:49 2021 -0400

    Use CICE-Consortium/Icepack master (NOAA-EMC#40)

    * switch to icepack master at consortium

commit 8a88024
Merge: d0a45a2 2540695
Author: Denise Worthen <[email protected]>
Date:   Mon Sep 20 09:28:26 2021 -0400

    Merge branch 'NOAA-EMC:emc/develop' into feature/updcice

commit 2540695
Author: Denise Worthen <[email protected]>
Date:   Thu Sep 16 08:28:30 2021 -0400

    Update CICE for latest Consortium master (NOAA-EMC#38)

        * Implement advanced snow physics in icepack and CICE
        * Fix time-stamping of CICE history files
        * Fix CICE history file precision

commit d0a45a2
Author: denise.worthen <[email protected]>
Date:   Thu Sep 16 07:44:22 2021 -0400

    update icepack submodule

commit 5cb78cd
Author: denise.worthen <[email protected]>
Date:   Wed Sep 15 09:15:42 2021 -0400

    fix rhoa when lowest_temp is 0.0

    * provide default value for rhoa when imported temp_height_lowest
    (Tair) is 0.0
    * resolves seg fault when frac_grid=false and do_ca=true

commit cd021b5
Merge: 7d2139c 6e89728
Author: denise.worthen <[email protected]>
Date:   Wed Sep 1 19:39:06 2021 -0400

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

commit 7d2139c
Merge: a1b3375 cb7d616
Author: denise.worthen <[email protected]>
Date:   Tue Aug 31 14:08:06 2021 -0400

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

commit a1b3375
Author: denise.worthen <[email protected]>
Date:   Tue Aug 31 14:07:50 2021 -0400

    update icepack

commit 397b4bd
Merge: aade124 7f089d0
Author: Denise Worthen <[email protected]>
Date:   Thu Aug 26 17:20:25 2021 -0400

    Merge branch 'NOAA-EMC:emc/develop' into feature/updcice

commit 7f089d0
Author: Denise Worthen <[email protected]>
Date:   Mon Aug 23 08:19:25 2021 -0400

    add memory profiling (NOAA-EMC#36)

    * add profile_memory calls to CICE cap

commit aade124
Author: denise.worthen <[email protected]>
Date:   Fri Aug 20 08:14:44 2021 -0400

    update icepack

commit aeb473a
Merge: 71f4fe6 26d917a
Author: denise.worthen <[email protected]>
Date:   Fri Aug 20 08:03:58 2021 -0400

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

commit 71f4fe6
Merge: 4373d3d 3fd897e
Author: denise.worthen <[email protected]>
Date:   Sun Aug 15 11:04:41 2021 -0400

    Merge remote-tracking branch 'TCraig/tmB' into feature/updcice

commit 4373d3d
Author: denise.worthen <[email protected]>
Date:   Sun Aug 15 11:04:01 2021 -0400

    update icepack

commit 3fd897e
Merge: 83068c7 2a692af
Author: apcraig <[email protected]>
Date:   Fri Aug 13 16:24:01 2021 -0600

    Merge branch 'master' of https://github.com/cice-consortium/cice into tmB

commit 83068c7
Author: apcraig <[email protected]>
Date:   Fri Aug 13 09:24:49 2021 -0600

    update evp1d test

commit e31ce7e
Author: apcraig <[email protected]>
Date:   Fri Aug 13 09:00:01 2021 -0600

    reset calchk to 100000 years

commit eaa3c3a
Author: apcraig <[email protected]>
Date:   Thu Aug 12 23:53:55 2021 -0600

    update documentation

commit c5794b4
Author: apcraig <[email protected]>
Date:   Thu Aug 12 23:49:05 2021 -0600

    Update testing

    - Add prod suite including 10 year gx1prod and qc test
    - Update unit test compare scripts

commit 7b5c2b4
Author: apcraig <[email protected]>
Date:   Thu Aug 12 16:57:18 2021 -0600

    Fix QC issues

    - Add netcdf ststus checks and aborts in ice_read_write.F90
    - Check for end of file when reading records in ice_read_write.F90 for
      ice_read_nc methods
    - Update set_nml.qc to better specify the test, turn off leap years since we're cycling
      2005 data
    - Add check in c ice.t-test.py to make sure there is at least 1825 files, 5 years of data
    - Add QC run to base_suite.ts to verify qc runs to completion and possibility to use
      those results directly for QC validation
    - Clean up error messages and some indentation in ice_read_write.F90

commit 96d5851
Author: apcraig <[email protected]>
Date:   Wed Aug 11 13:26:01 2021 -0600

    update model log output in ice_init

commit b3364a6
Author: apcraig <[email protected]>
Date:   Tue Aug 10 22:21:33 2021 -0600

    fix implementation error

commit 15763d8
Author: apcraig <[email protected]>
Date:   Tue Aug 10 17:14:25 2021 -0600

    revert set_nml.histall

commit 441f693
Author: apcraig <[email protected]>
Date:   Tue Aug 10 17:04:56 2021 -0600

    Fix history features

    - Fix bug in history time axis when sec_init is not zero.
    - Fix issue with time_beg and time_end uninitialized values.
    - Add support for averaging with histfreq='1' by allowing histfreq_n to be any value
      in that case.  Extend and clean up construct_filename for history files.  More could
      be done, but wanted to preserve backwards compatibility.
    - Add new calendar_sec2hms to converts daily seconds to hh:mm:ss.  Update the
      calchk calendar unit tester to check this method
    - Remove abort test in bcstchk, this was just causing problems in regression testing
    - Remove known problems documentation about problems writing when istep=1.  This issue
      does not exist anymore with the updated time manager.
    - Add new tests with hist_avg = false.  Add set_nml.histinst.

commit 55586f7
Author: denise.worthen <[email protected]>
Date:   Tue Jul 20 11:21:12 2021 -0400

    update icepack and revert gitmodules

commit 1721728
Merge: 9057817 85531cf
Author: denise.worthen <[email protected]>
Date:   Fri Jul 2 09:49:24 2021 -0400

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

commit 9057817
Merge: f3b2652 995f3af
Author: denise.worthen <[email protected]>
Date:   Thu Jun 24 08:34:26 2021 -0400

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

commit f3b2652
Author: denise.worthen <[email protected]>
Date:   Thu Jun 24 08:32:44 2021 -0400

    update icepack and pointer

commit 0c39047
Merge: 9a76541 d1f2d15
Author: denise.worthen <[email protected]>
Date:   Thu Jun 24 08:30:26 2021 -0400

    Merge branch 'emc/develop' into feature/updcice

commit d1f2d15
Merge: 74e7b58 9d88d92
Author: denise.worthen <[email protected]>
Date:   Fri Jun 11 09:13:53 2021 -0400

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

commit 9d88d92
Author: Denise Worthen <[email protected]>
Date:   Thu Jun 10 18:08:12 2021 -0400

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

commit 74e7b58
Merge: b52e91c 519d339
Author: denise.worthen <[email protected]>
Date:   Sat Jun 5 17:35:52 2021 -0400

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

commit 519d339
Author: Denise Worthen <[email protected]>
Date:   Fri Jun 4 16:41:08 2021 -0400

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

    update CICE and Icepack

    * changes the criteria for aborting ice for thermo-conservation errors
    * updates the time manager
    * fixes two bugs in ice_therm_mushy
    * updates Icepack to Consortium master w/ flip of abort flag for troublesome IC cases

commit 9a76541
Author: denise.worthen <[email protected]>
Date:   Fri Jun 4 16:01:59 2021 -0400

    update icepack

commit d8fb6d9
Author: denise.worthen <[email protected]>
Date:   Wed Jun 2 16:57:19 2021 -0400

    switch icepack branches

    * update to icepack master but set abort flag in ITD routine
    to false

commit 51db2f9
Merge: b52e91c bd512d4
Author: denise.worthen <[email protected]>
Date:   Tue Jun 1 09:17:15 2021 -0400

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

commit b52e91c
Merge: 840e931 2eca569
Author: denise.worthen <[email protected]>
Date:   Mon Apr 5 08:40:40 2021 -0400

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

commit 2eca569
Author: denise.worthen <[email protected]>
Date:   Mon Apr 5 08:29:35 2021 -0400

    update icepack

commit 66546ae
Merge: 1e4d393 5a0a559
Author: denise.worthen <[email protected]>
Date:   Sun Mar 14 09:27:54 2021 -0400

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

commit 1e4d393
Merge: 2a0f332 f773ef3
Author: denise.worthen <[email protected]>
Date:   Sun Mar 14 09:19:52 2021 -0400

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

commit 840e931
Merge: 23cdee7 f773ef3
Author: denise.worthen <[email protected]>
Date:   Tue Nov 10 10:44:16 2020 -0500

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

commit f773ef3
Author: Denise Worthen <[email protected]>
Date:   Tue Nov 10 10:37:11 2020 -0500

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

    updates include:

    * deprecate upwind advection (CICE-Consortium#508)
    * add implicit VP solver (CICE-Consortium#491)

commit 2a0f332
Author: denise.worthen <[email protected]>
Date:   Tue Nov 10 10:29:03 2020 -0500

    update gitmodules, update icepack

commit 41afe74
Author: denise.worthen <[email protected]>
Date:   Fri Oct 30 17:47:51 2020 +0000

    add ice_dyn_vp module to CICE_InitMod

commit 2515f77
Merge: 1e4f42b 12fdb47
Author: denise.worthen <[email protected]>
Date:   Fri Oct 30 11:14:19 2020 -0400

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

commit 1e4f42b
Author: denise.worthen <[email protected]>
Date:   Fri Oct 30 11:13:17 2020 -0400

    update icepack

commit 23cdee7
Merge: 8129aab ac617cd
Author: denise.worthen <[email protected]>
Date:   Thu Oct 8 07:17:42 2020 -0400

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

commit ac617cd
Author: Minsuk Ji <[email protected]>
Date:   Thu Oct 8 07:13:14 2020 -0400

    Support TACC stampede (NOAA-EMC#19)

commit 8129aab
Merge: 6d30789 c0a2e2d
Author: denise.worthen <[email protected]>
Date:   Mon Aug 31 13:29:35 2020 -0400

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

commit 6d30789
Merge: 5dcfca8 285985c
Author: denise.worthen <[email protected]>
Date:   Mon Aug 31 16:59:48 2020 +0000

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

commit 285985c
Author: Denise Worthen <[email protected]>
Date:   Mon Aug 31 12:53:02 2020 -0400

    Update CICE6 for integration to S2S

    * add wcoss_dell_p3 compiler macro

    * update to icepack w/ debug fix

    * replace SITE with MACHINE_ID

    * update compile scripts

commit 5dcfca8
Merge: 5ecde75 4d7ba5b
Author: denise.worthen <[email protected]>
Date:   Thu Aug 13 13:06:16 2020 -0400

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

commit 4d7ba5b
Merge: d81a834 eb77517
Author: denise.worthen <[email protected]>
Date:   Thu Aug 13 12:57:55 2020 -0400

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

commit d81a834
Author: Denise Worthen <[email protected]>
Date:   Thu Aug 13 09:40:18 2020 -0400

    Fixcommit (NOAA-EMC#14)

    Align commit history between emc/develop and cice-consortium/master

commit 5ecde75
Merge: 88cc2fd bdf1a1f
Author: denise.worthen <[email protected]>
Date:   Wed Aug 12 16:24:04 2020 -0400

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

commit bdf1a1f
Author: Denise Worthen <[email protected]>
Date:   Wed Aug 12 15:55:21 2020 -0400

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

    Update to emc/develop fork to current CICE consortium

    Co-authored-by: David A. Bailey <[email protected]>
    Co-authored-by: Tony Craig <[email protected]>
    Co-authored-by: Elizabeth Hunke <[email protected]>
    Co-authored-by: Mariana Vertenstein <[email protected]>
    Co-authored-by: apcraig <[email protected]>
    Co-authored-by: Philippe Blain <[email protected]>

commit 88cc2fd
Merge: c084de4 003aae0
Author: denise.worthen <[email protected]>
Date:   Wed Aug 5 18:35:50 2020 -0400

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

commit c084de4
Merge: 86b8dab b055c7f
Author: denise.worthen <[email protected]>
Date:   Fri Jul 17 17:24:15 2020 -0400

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

commit 86b8dab
Merge: 9bdb9ad 8f37bfc
Author: denise.worthen <[email protected]>
Date:   Fri Jul 17 13:15:25 2020 +0000

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

commit 8f37bfc
Author: Minsuk Ji <[email protected]>
Date:   Fri Jul 17 09:05:06 2020 -0400

    cice6 compile (NOAA-EMC#6)

    * enable debug build. fix to remove errors

    * fix an error in comp_ice.backend.libcice

    * change Orion to orion for machine identification

commit 9bdb9ad
Merge: 916c6af c22c6d5
Author: denise.worthen <[email protected]>
Date:   Wed Jul 15 13:15:02 2020 -0400

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

commit 916c6af
Author: Denise Worthen <[email protected]>
Date:   Tue Jul 14 08:18:33 2020 -0400

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

commit 8ff4ee0
Author: denise.worthen <[email protected]>
Date:   Tue Jul 7 15:46:57 2020 -0400

    change Orion to orion in backend

    remove duplicate print lines from ice_transport_driver

commit 4e8cc79
Merge: f92bef3 93f0e86
Author: denise.worthen <[email protected]>
Date:   Tue Jul 7 15:32:13 2020 -0400

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

commit f92bef3
Author: denise.worthen <[email protected]>
Date:   Tue Jul 7 15:20:45 2020 -0400

    update icepack submodule

commit 93f0e86
Merge: 8ebdda9 6b4a277
Author: David A. Bailey <[email protected]>
Date:   Tue Jul 7 13:19:36 2020 -0600

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

    Add restart_coszen namelist option

commit 6b4a277
Merge: 27dd3b7 8ebdda9
Author: David A. Bailey <[email protected]>
Date:   Tue Jul 7 13:19:22 2020 -0600

    Merge branch 'nuopc' into coszen

commit 50bf856
Merge: 3bb3694 fcf8989
Author: denise.worthen <[email protected]>
Date:   Tue Jul 7 15:03:30 2020 -0400

    Merge remote-tracking branch 'upstream/master'

commit 27dd3b7
Author: David Bailey <[email protected]>
Date:   Tue Jul 7 12:40:33 2020 -0600

    Add restart_coszen namelist option

commit 8ebdda9
Merge: e4c989c 30a81cc
Author: David A. Bailey <[email protected]>
Date:   Tue Jul 7 12:39:20 2020 -0600

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

    cleanup changes to nuopc branch

commit 30a81cc
Author: Mariana Vertenstein <[email protected]>
Date:   Tue Jul 7 12:17:21 2020 -0600

    fixed white space issue

commit e4c989c
Merge: 178693a fcf8989
Author: David Bailey <[email protected]>
Date:   Mon Jul 6 10:24:24 2020 -0600

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

commit aea1aa8
Merge: 178693a 41855fd
Author: Mariana Vertenstein <[email protected]>
Date:   Sat Jul 4 15:04:13 2020 -0600

    update to latest nuopc changes

commit 41855fd
Author: Mariana Vertenstein <[email protected]>
Date:   Sat Jul 4 14:29:12 2020 -0600

    fixes to get cesm working

commit 3a1b88b
Author: denise.worthen <[email protected]>
Date:   Sat Jul 4 13:25:48 2020 -0600

    fix compile errors

commit b4afd2e
Author: Mariana Vertenstein <[email protected]>
Date:   Sat Jul 4 11:59:19 2020 -0600

    removal of many cpp-ifdefs

commit 178693a
Merge: 902e883 c762336
Author: David Bailey <[email protected]>
Date:   Thu Jul 2 15:28:07 2020 -0600

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

commit 902e883
Author: David Bailey <[email protected]>
Date:   Thu Jul 2 15:27:55 2020 -0600

    Fix logging issues for NUOPC

commit 6bccf71
Author: denise.worthen <[email protected]>
Date:   Thu Jul 2 13:19:25 2020 -0600

    remove cesmcoupled ifdefs

commit c762336
Author: David Bailey <[email protected]>
Date:   Thu Jul 2 11:36:49 2020 -0600

    Move the forapps directory

commit 46fcfba
Author: denise.worthen <[email protected]>
Date:   Thu Jul 2 05:24:54 2020 -0600

    changes for coldstart running

commit 73e7774
Author: David Bailey <[email protected]>
Date:   Wed Jul 1 14:41:27 2020 -0600

    Fix additional OMP problems

commit ad03424
Author: David Bailey <[email protected]>
Date:   Wed Jul 1 12:52:00 2020 -0600

    Fix threading problem in init_bgc

commit 239c7de
Merge: b4da8a6 415df0e
Author: David Bailey <[email protected]>
Date:   Wed Jul 1 12:50:38 2020 -0600

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

commit b4da8a6
Merge: 6affdcf 55ca18b
Author: David Bailey <[email protected]>
Date:   Wed Jul 1 12:50:14 2020 -0600

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

commit 415df0e
Merge: b5a6058 6affdcf
Author: David Bailey <[email protected]>
Date:   Wed Jul 1 10:08:07 2020 -0600

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

commit b5a6058
Merge: 7848fdf 55ca18b
Author: David Bailey <[email protected]>
Date:   Wed Jul 1 10:07:31 2020 -0600

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

commit 6affdcf
Merge: 7848fdf c6c20bf
Author: David Bailey <[email protected]>
Date:   Mon Jun 29 15:31:28 2020 -0600

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

commit 089f60f
Author: denise.worthen <[email protected]>
Date:   Thu Jun 25 15:18:56 2020 +0000

    update comp_ice.backend with temporary ice_timers fix

commit 6982ee4
Merge: 308a1d4 7848fdf
Author: denise.worthen <[email protected]>
Date:   Thu Jun 25 14:03:59 2020 +0000

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

commit 7848fdf
Merge: 7e43703 f532dd9
Author: David Bailey <[email protected]>
Date:   Wed Jun 24 15:46:15 2020 -0600

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

commit 308a1d4
Author: denise.worthen <[email protected]>
Date:   Mon Jun 22 15:05:32 2020 -0600

    Revert "update icepack submodule"

    This reverts commit e70d1ab.

commit e70d1ab
Author: denise.worthen <[email protected]>
Date:   Mon Jun 22 14:58:13 2020 -0600

    update icepack submodule

commit f41f1e9
Merge: 7ac0e3d 7e43703
Author: denise.worthen <[email protected]>
Date:   Mon Jun 22 20:52:39 2020 +0000

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

commit 3bb3694
Author: Denise Worthen <[email protected]>
Date:   Fri Jun 5 13:32:44 2020 -0400

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

    * Add atmiter_conv to CICE

    * Add documentation

    * trigger build the docs

    Co-authored-by: David A. Bailey <[email protected]>

commit 397e588
Merge: d46d691 2054d09
Author: denise.worthen <[email protected]>
Date:   Tue Jun 2 12:31:56 2020 -0400

    Merge remote-tracking branch 'upstream/master'

commit 7e43703
Merge: 80c9e6e 53715ea
Author: David A. Bailey <[email protected]>
Date:   Tue May 26 09:15:51 2020 -0600

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

    changes to satisfy ufsatm and cesm requirements for pot temp and density from atm

commit 53715ea
Author: Mariana Vertenstein <[email protected]>
Date:   Sun May 24 18:06:06 2020 -0600

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

commit 80c9e6e
Merge: 8f0b5ee bce31c2
Author: David Bailey <[email protected]>
Date:   Tue May 19 09:09:00 2020 -0600

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

commit 7ac0e3d
Merge: 10e7c20 8f0b5ee
Author: Denise Worthen <[email protected]>
Date:   Tue May 12 10:02:58 2020 -0400

    Merge pull request #1 from ESCOMP/nuopc

commit 8f0b5ee
Merge: 10e7c20 ce8e5a9
Author: David A. Bailey <[email protected]>
Date:   Sun May 10 08:24:19 2020 -0600

    Merge pull request #2 from apcraig/ufs01

    Update CICE for coupling with UFS

commit ce8e5a9
Author: apcraig <[email protected]>
Date:   Sat May 9 21:29:22 2020 -0600

    update CICE6 to support coupling with UFS

commit 10e7c20
Author: Mariana Vertenstein <[email protected]>
Date:   Wed Apr 29 16:36:09 2020 -0600

    fixed problems in updated orbital calculations needed for cesm

commit 183218a
Author: Mariana Vertenstein <[email protected]>
Date:   Thu Apr 23 17:43:35 2020 -0600

    updated orbital calculations needed for cesm

commit d46d691
Author: Denise Worthen <[email protected]>
Date:   Wed Apr 22 14:48:08 2020 -0400

    merge latest master (NOAA-EMC#4)

    * Isotopes for CICE (CICE-Consortium#423)

    Co-authored-by: apcraig <[email protected]>
    Co-authored-by: David Bailey <[email protected]>
    Co-authored-by: Elizabeth Hunke <[email protected]>

commit 71d2ded
Merge: 99470ed 9ac1863
Author: Denise Worthen <[email protected]>
Date:   Thu Apr 2 15:13:02 2020 -0400

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

commit 99470ed
Merge: 0338d04 7e2a1d9
Author: Denise Worthen <[email protected]>
Date:   Sat Mar 7 10:03:29 2020 -0500

    Merge pull request #2 from CICE-Consortium/master

commit 0338d04
Merge: b5134ad 7e11a34
Author: Denise Worthen <[email protected]>
Date:   Tue Feb 25 08:43:10 2020 -0500

    Merge pull request #1 from CICE-Consortium/master
Merge branch 'emc/develop' into feature/main6.4.2