Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixcommit #14

Merged
merged 19 commits into from
Aug 13, 2020
Merged

Fixcommit #14

merged 19 commits into from
Aug 13, 2020

Commits on Jul 9, 2020

  1. CICE addition of fswthru by components. (CICE-Consortium#479)

    * Start of fswthru by components
    
    * Remove CESM2 MCT drivers
    
    * Updated fswthru by components
    
    * Update documentation
    dabail10 authored Jul 9, 2020
    Configuration menu
    Copy the full SHA
    d6a1d80 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Update README.md

    Update Version Index to Release Table
    apcraig authored Jul 13, 2020
    Configuration menu
    Copy the full SHA
    15a884c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    78b7a12 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c22c6d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. Configuration menu
    Copy the full SHA
    9bdb9ad View commit details
    Browse the repository at this point in the history
  2. Update README.md

    apcraig authored Jul 15, 2020
    Configuration menu
    Copy the full SHA
    ee5a0e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. Configuration menu
    Copy the full SHA
    86b8dab View commit details
    Browse the repository at this point in the history
  2. Add restart_coszen namelist option (CICE-Consortium#480)

    * updated orbital calculations needed for cesm
    
    * fixed problems in updated orbital calculations needed for cesm
    
    * update CICE6 to support coupling with UFS
    
    * put in changes so that both ufsatm and cesm requirements for potential temperature and density are satisfied
    
    * update icepack submodule
    
    * Revert "update icepack submodule"
    
    This reverts commit e70d1ab.
    
    * update comp_ice.backend with temporary ice_timers fix
    
    * Fix threading problem in init_bgc
    
    * Fix additional OMP problems
    
    * changes for coldstart running
    
    * Move the forapps directory
    
    * remove cesmcoupled ifdefs
    
    * Fix logging issues for NUOPC
    
    * removal of many cpp-ifdefs
    
    * fix compile errors
    
    * fixes to get cesm working
    
    * fixed white space issue
    
    * Add restart_coszen namelist option
    
    * Move restart_coszen to forcing_nml
    
    * Update documentation on restart_coszen
    
    Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu>
    Co-authored-by: apcraig <anthony.p.craig@gmail.com>
    Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
    4 people authored Jul 17, 2020
    Configuration menu
    Copy the full SHA
    b055c7f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c084de4 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. Update CPP implementation (CICE-Consortium#490)

    * Update CPPs
    Rename ncdf to USE_NETCDF (ncdf still works) and update USE_NETCDF implementation
    Update NO_I8
    Update NO_R16
    Remove popcice
    
    * Convert ORCA_GRID CPP to orca_halogrid namelist
    Convert a RASM_MODS CPP to bathymetry_format namelist to support reading a pop vertical grid file
    Convert gather_scatter_barrier CPP to add_mpi_barriers namelist
    Document
    
    * update documentation
    
    * update documentation, remove coupled macros as this is going away soon and change cpp directive to cpp macro
    
    Co-authored-by: Philippe Blain <levraiphilippeblain@gmail.com>
    apcraig and phil-blain authored Jul 31, 2020
    Configuration menu
    Copy the full SHA
    819eedd View commit details
    Browse the repository at this point in the history
  2. Remove "coupled" CPP flag, add ssh_stress namelist (CICE-Consortium#496)

    * Remove "coupled" CPP flag and replace as needed
      Remove "fake MPI" capability in serial/ice_communicate.F90
      Add ssh_stress variable/namelist with options 'geostrophic' or 'slope' to specify the computation of the sea surface height stress term.
      Add ssh_stress to ice_in, set to 'geostrophic'.
      Add ssh_stress to namelist documentation
      Change "coupled" to CESMCOUPLED in ice_init on check for oceanmixed_ice setting
      Clean up drivers
        remove "coupled" and CESMCOUPLED from standalone/cice as if neither were set
        remove "coupled" macro end_run call in nuopc/cmeps, CESMCOUPLED left mostly alone
        remove "coupled" and CESMCOUPLED from mct/cesm1 as if both were set
        remove "coupled" and CESMCOUPLED from direct/hadgem as if both were set
        no changes to nuopc/dmi, prefer dmi make those changes
    Fix error in coriolis namelist documentation where Cstar was in the wrong place
    
    NOTE: Coupled systems should leverage the new ssh_stress namelist to turn on the 'slope' option.  The coupled CPP flag is no longer in use.
    
    * rename ssh_stress option from slope to coupled and update documentation
    
    * update documentation
    
    * update warning message for oceanmixed_ice
    apcraig authored Jul 31, 2020
    Configuration menu
    Copy the full SHA
    06b3be5 View commit details
    Browse the repository at this point in the history
  3. Add support for .cice_set, git clone --depth=1, atmbndy namelist outp…

    …ut, script warning messages for --set conflicts (CICE-Consortium#494)
    
    * Add support for .cice_set (CICE-Consortium#464)
    Add warning messages when multiple set options overlap (CICE-Consortium#243)
    Fix namelist output diagnostic for atmbndy (CICE-Consortium#493)
    Modify git clone in script to use --depth=1 (CICE-Consortium#492)
    
    * update doc precedence
    
    * update documentation, add info about .cice_set format
    
    Co-authored-by: Philippe Blain <levraiphilippeblain@gmail.com>
    apcraig and phil-blain authored Jul 31, 2020
    Configuration menu
    Copy the full SHA
    9e8a300 View commit details
    Browse the repository at this point in the history
  4. Send swpen by category (CICE-Consortium#495)

    Send broadband fswthrun by categories to coupler.
    dabail10 authored Jul 31, 2020
    Configuration menu
    Copy the full SHA
    6a3e60c View commit details
    Browse the repository at this point in the history
  5. Add sw_redist option to CICE (CICE-Consortium#497)

    This integrates the sw_redist changes from Icepack into CICE.
    
    Add three new namelist, sw_redist, sw_frac, and sw_dtemp.
    
    The alt03 and alt04 test cases have been updated so that ktherm=1 is bfb. The default settings are such that ktherm=2 is bfb. This is the other piece to addressing issue CICE-Consortium#485 and CICE-Consortium/Icepack#280.
    dabail10 authored Jul 31, 2020
    Configuration menu
    Copy the full SHA
    003aae0 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Configuration menu
    Copy the full SHA
    88cc2fd View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2020

  1. Update Icepack to 4c42a82, non bit-for-bit changes (CICE-Consortium#499)

    * update icepack to 4c42a82
    
    * remove two failing test configurations with iobinary due to bathymetry netcdf file requirements
    apcraig authored Aug 8, 2020
    Configuration menu
    Copy the full SHA
    12d16ed View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2020

  1. Configuration menu
    Copy the full SHA
    5ecde75 View commit details
    Browse the repository at this point in the history
  2. Latest NUOPC caps (CICE-Consortium#500)

    * updated orbital calculations needed for cesm
    
    * fixed problems in updated orbital calculations needed for cesm
    
    * update CICE6 to support coupling with UFS
    
    * put in changes so that both ufsatm and cesm requirements for potential temperature and density are satisfied
    
    * update icepack submodule
    
    * Revert "update icepack submodule"
    
    This reverts commit e70d1ab.
    
    * update comp_ice.backend with temporary ice_timers fix
    
    * Fix threading problem in init_bgc
    
    * Fix additional OMP problems
    
    * changes for coldstart running
    
    * Move the forapps directory
    
    * remove cesmcoupled ifdefs
    
    * Fix logging issues for NUOPC
    
    * removal of many cpp-ifdefs
    
    * fix compile errors
    
    * fixes to get cesm working
    
    * fixed white space issue
    
    * Add restart_coszen namelist option
    
    * Update NUOPC cap to work with latest CICE6 master
    
    * nuopc,cmeps or s2s build updates
    
    * fixes for dbug_flag
    
    * Update nuopc2 to latest CICE master
    
    * Fix some merge problems
    
    * Fix dbug variable
    
    * Manual merge of UFS changes
    
    Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu>
    Co-authored-by: apcraig <anthony.p.craig@gmail.com>
    Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
    4 people authored Aug 12, 2020
    Configuration menu
    Copy the full SHA
    eb77517 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Configuration menu
    Copy the full SHA
    fe89e19 View commit details
    Browse the repository at this point in the history