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

does this work #3

Merged
merged 15 commits into from
Nov 8, 2019
Merged

does this work #3

merged 15 commits into from
Nov 8, 2019

Conversation

TillRasmussen
Copy link
Owner

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

  • Short (1 sentence) summary of your PR:
    ENTER INFORMATION HERE
  • Developer(s):
    ENTER INFORMATION HERE
  • Suggest PR reviewers from list in the column to the right.
  • Please copy the PR test results link or provide a summary of testing completed below.
    ENTER INFORMATION HERE
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/. A test build of the technical docs will be performed as part of the PR testing.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please provide any additional information or relevant details below:

apcraig and others added 15 commits August 28, 2019 11:13
* Add cice.make script, list makdep as prerequisite

* cice.make can be used to easily call make with the different targets
  present in the Makefile (db_files, db_flags, clean), or to pass
  different flags to make
* makdep is listed as a prerequisite of the *.d files, such that
  we don't need to call make makdep separately in cice.build

* Update db_files and db_flags rules in Makefile

* Remove $(INCS) variable from build rules

The -I flag is used by Fortran compilers to locate files
included via the "#include" preprocessor directive or the "include" statement,
or modules referenced via the "use" statement. In our codebase we only use
modules, and all modules files (*.mod) are put in the ${ICE_OBJDIR} directory,
where the compilation takes place. So there is no need for all source directories
(contained in the variable $(INCS), prefixed with -I) to be added to the build
rules. This shortens the length of the displayed compilation lines.

* Update documentation

* add cice.build argument capabilities

* update documentation

* update documentation

* update documentation

* cleanup of documentation and implementation

* update implementation based on reviews

* update documentation

* update documentation

* update documentation

* update documentation

* update Makefile and documentation
* izumi initial port

* update izumi port and add nothread_suite

* update kind conversions in ice_dyn_evp_1d.F90
* Fix local solar time

* Add line for going past 24

* New LST calculation

Addresses #3.
…nsortium#358)

* Refactor boxslotcyl initialization to use icepack parameters

* Fix documentation typo

* Correct use statement rename syntax

* Change days_to_s to secday
* fixing rst errors

* removing implementation notes line
* update icepack, nag cleanup, remove tabs

* update dyrect in boxslotcyl
* adding COREII citation

* modifying PR template for RTD change
CICE-Consortium#350)

* Added new capability in ice_forcing.F90 to test with JRA55 atmospheric forcing on gx1 grid.

* Added JRA55 as an option under atm_data_type

* Modified ice_forcing.F90 by replacing
elseif (trim(atm_data_format) == 'nc') then ! netcdf

with

elseif (trim(atm_data_type) == 'JRA55') then ! netcdf

Corrected comment regarding JRA55 forcing to state "E.g. record 1 gives conditions at 3 am GMT on 1 January"

Modified ./scripts/options/set_nml.jra55 by
setting use_restart_time = .false.
setting year_init = 2005
setting fyear_init - 2005
and corrected units for precip_units    = 'mks'

edited ./scripts/tests/base_suite.ts by reinstating bgc restart test and added a jra55 "short" smoke test.

* fix an incorrect test in the base suite

* Add a check in init_forcing_atmo to check if 'use_leap_years' is set to true.  If so, abort if the atm_data_type is not JRA55, default, or box2001

* Fix a mistake in diagnostic warning output for the use_leap_years check

* set use_leap_years to false in the boxrestore namelist option file

* add use_restart_time specification to test_nml.restart* files

* Remove options in JRA55 namelist option file that are the same as the default in ice_in.  Also remove the specification of use_restart_time to .false.

* fix a bug in the newly-implemented use_leap_years check during initialization

* add use_leap_years and use_restart_time specification to jra55 namelist option file

* add new jra55_2008 and run90day namelist option files

* modify the JRA55 smoke test to be a 90 day test and start in 2008.  Also add a restart test for JRA55 in base_suite

* update documentation to include citation for JRA55
…e_dyn_evp_1d (CICE-Consortium#367)

* merge ice_dyn_evp_1d modules and update ice_dyn_evp_1d interface names.  Add get_bathymetry_popfile from RASM

* remove old code

* remove old code
…m#370)

* update zenodo json template and report_results script

* update .gitignore add testsuite*

* update zenodo json file

* update gitignore again and add ciceexe cleanup
* NUOPC branch

* initial CICE6 port to CESM+NUOPC

* clean up nu_diag initialization due to complexity added by nuopc cap

* add nu_diag_set flag to work around the nu_diag setting in the nuopc cap

* update cice driver directories

* update documentation

* update documentation

* update documentation

* update documentation

* fix minor bug in cice.setup that affects settings parsing without final carriage return

* update documentation

* rename drivers/subroutine to drivers/direct and update documentation
@TillRasmussen TillRasmussen merged commit 03911d6 into coupled Nov 8, 2019
TillRasmussen pushed a commit that referenced this pull request Nov 17, 2021
Add a subroutine mimicking what 'viscous_coeffs_and_rep_pressure' does,
but at a single location.

Name it '*_T' since it's going to be used to compute the viscous
coefficients and replacement pressure at the T point.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants