Skip to content

Feature/compilefix#17

Merged
DeniseWorthen merged 37 commits into
NOAA-EMC:emc/developfrom
DeniseWorthen:feature/compilefix
Aug 31, 2020
Merged

Feature/compilefix#17
DeniseWorthen merged 37 commits into
NOAA-EMC:emc/developfrom
DeniseWorthen:feature/compilefix

Conversation

@DeniseWorthen
Copy link
Copy Markdown
Collaborator

@DeniseWorthen DeniseWorthen commented Aug 19, 2020

Dependent NEMS PR #75. NEMS will need to be updated prior to CICE6 commit to S2S.

fix compile errors from fswthru addition in scale_fluxes
change case of "orion" in clean backend
@DeniseWorthen DeniseWorthen marked this pull request as draft August 19, 2020 23:47
TillRasmussen and others added 9 commits August 26, 2020 08:55
…sed. The current construction did not use the calculated values as they were defined private and overwritten at each i/j (CICE-Consortium#507)
* deprecate upwind advection

* fix diagnostic info

* remove single quotes

* error message if upwind is used
The documentation states that this test case sets 'coriolis' to zero,
but 'configuration/scripts/options/set_nml.box2001' sets 'coriolis' to 'constant'.
Fix the documentation to be in line with the code.

While at it, add the correct unit for the Coriolis parameter (in both places
where it appears in the documentation).

Closes CICE-Consortium#509

Reported-by: Jean-François Lemieux <jean-francois.lemieux@canada.ca>
Ice pressure is different from ice strength, so remove 'pressure' from
the description of 'ice strength'.
@DeniseWorthen DeniseWorthen marked this pull request as ready for review August 31, 2020 16:10
@DeniseWorthen DeniseWorthen merged commit 285985c into NOAA-EMC:emc/develop Aug 31, 2020
@XiujuanSu-NOAA
Copy link
Copy Markdown

XiujuanSu-NOAA commented Aug 31, 2020 via email

@DeniseWorthen
Copy link
Copy Markdown
Collaborator Author

@XiujuanSu-NOAA It was assigned by mistake. I apologize. No need for you to review. Thanks.

@DeniseWorthen DeniseWorthen deleted the feature/compilefix branch October 7, 2020 22:01
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.

9 participants