Skip to content

update icepack, copyright, version number #326

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.

Sign up for GitHub

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

Merged
apcraig merged 1 commit into from
Jun 25, 2019
Merged

update icepack, copyright, version number #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cicecore/drivers/cesm/CICE_copyright.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
! Copyright (c) 2018, Triad National Security, LLC
! Copyright (c) 2019, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2018. Triad National Security, LLC. This software was
! Copyright 2019. Triad National Security, LLC. This software was
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
! Alamos National Laboratory (LANL), which is operated by Triad
! National Security, LLC for the U.S. Department of Energy. The U.S.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/cice/CICE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
!=======================================================================
! Copyright (c) 2018, Triad National Security, LLC
! Copyright (c) 2019, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2018. Triad National Security, LLC. This software was
! Copyright 2019. Triad National Security, LLC. This software was
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
! Alamos National Laboratory (LANL), which is operated by Triad
! National Security, LLC for the U.S. Department of Energy. The U.S.
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/hadgem3/CICE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
!=======================================================================
! Copyright (c) 2018, Triad National Security, LLC
! Copyright (c) 2019, Triad National Security, LLC
! All rights reserved.
!
! Copyright 2018. Triad National Security, LLC. This software was
! Copyright 2019. Triad National Security, LLC. This software was
! produced under U.S. Government contract DE-AC52-06NA25396 for Los
! Alamos National Laboratory (LANL), which is operated by Triad
! National Security, LLC for the U.S. Department of Energy. The U.S.
Expand Down
2 changes: 1 addition & 1 deletion cicecore/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CICE 6.0.0
CICE 6.0.1
6 changes: 3 additions & 3 deletions doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@

# General information about the project.
project = u'CICE'
copyright = u'2018, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
copyright = u'2019, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
author = u'CICE-Consortium'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = u'6.0.0'
version = u'6.0.1'
# The full version, including alpha/beta/rc tags.
version = u'6.0.0'
version = u'6.0.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/intro/copyright.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Copyright
=============================

© Copyright 2018, Triad National Security LLC. All rights reserved.
© Copyright 2019, Triad National Security LLC. All rights reserved.
This software was produced under U.S. Government contract
89233218CNA000001 for Los Alamos National Laboratory (LANL), which is
operated by Triad National Security, LLC for the U.S. Department
Expand Down
2 changes: 1 addition & 1 deletion icepack
Open in desktop
Submodule icepack updated 52 files
+28 −19 .github/PULL_REQUEST_TEMPLATE
+3 −0 .gitignore
+1 −4 .travis.yml
+1 −1 columnphysics/icepack_aerosol.F90
+15 −15 columnphysics/icepack_algae.F90
+2 −2 columnphysics/icepack_meltpond_topo.F90
+7 −7 columnphysics/icepack_zbgc_shared.F90
+1 −1 columnphysics/icepack_zsalinity.F90
+1 −1 columnphysics/version.txt
+4 −4 configuration/driver/icedrv_calendar.F90
+1 −1 configuration/driver/icedrv_constants.F90
+7 −7 configuration/driver/icedrv_init_column.F90
+12 −0 configuration/scripts/Makefile
+11 −5 configuration/scripts/icepack.batch.csh
+2 −1 configuration/scripts/icepack.build
+5 −13 configuration/scripts/machines/Macros.badger_intel
+5 −14 configuration/scripts/machines/Macros.cheyenne_intel
+5 −14 configuration/scripts/machines/Macros.conrad_cray
+5 −14 configuration/scripts/machines/Macros.conrad_gnu
+5 −14 configuration/scripts/machines/Macros.conrad_intel
+5 −14 configuration/scripts/machines/Macros.conrad_pgi
+5 −14 configuration/scripts/machines/Macros.cori_intel
+6 −16 configuration/scripts/machines/Macros.gaffney_gnu
+5 −15 configuration/scripts/machines/Macros.gaffney_intel
+5 −14 configuration/scripts/machines/Macros.gaffney_pgi
+5 −14 configuration/scripts/machines/Macros.gordon_cray
+5 −14 configuration/scripts/machines/Macros.gordon_gnu
+5 −14 configuration/scripts/machines/Macros.gordon_intel
+5 −14 configuration/scripts/machines/Macros.gordon_pgi
+47 −0 configuration/scripts/machines/Macros.high_Sierra_gnu
+5 −7 configuration/scripts/machines/Macros.hobart_intel
+7 −9 configuration/scripts/machines/Macros.hobart_nag
+5 −15 configuration/scripts/machines/Macros.koehr_gnu
+5 −15 configuration/scripts/machines/Macros.koehr_intel
+5 −14 configuration/scripts/machines/Macros.koehr_pgi
+5 −8 configuration/scripts/machines/Macros.loft_gnu
+5 −14 configuration/scripts/machines/Macros.onyx_cray
+5 −14 configuration/scripts/machines/Macros.onyx_gnu
+5 −14 configuration/scripts/machines/Macros.onyx_intel
+5 −14 configuration/scripts/machines/Macros.testmachine_intel
+66 −0 configuration/scripts/machines/Macros.theia
+5 −14 configuration/scripts/machines/Macros.thunder_intel
+7 −10 configuration/scripts/machines/Macros.travisCI_gnu
+11 −9 configuration/scripts/machines/env.cori_intel
+15 −0 configuration/scripts/machines/env.high_Sierra_gnu
+3 −1 configuration/scripts/machines/env.hobart_nag
+49 −0 configuration/scripts/machines/env.theia
+3 −3 doc/source/conf.py
+13 −0 doc/source/developer_guide/dg_about.rst
+1 −1 doc/source/intro/copyright.rst
+13 −1 doc/source/user_guide/ug_running.rst
+1 −1 doc/source/user_guide/ug_testing.rst