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

gitlab: New build stages to test compiling without libraries #757

Merged
merged 1 commit into from
Apr 26, 2018
Merged

gitlab: New build stages to test compiling without libraries #757

merged 1 commit into from
Apr 26, 2018

Conversation

adcroft
Copy link
Collaborator

@adcroft adcroft commented Apr 26, 2018

  • Adds two new jobs to the gitlab pipeline (ocean-only and ice-ocean) that compiles everything in one stage rather than via libraries. This should catch any name space conflicts, as recently encountered, that the libraries approach ignores.
  • This is not a code change.

- New jobs build ocean_only and ice_ocean_SIS2 without the libfms.a step.
  This will help detect namespace collisions that the library approach
  does not complain about.
@Hallberg-NOAA Hallberg-NOAA merged commit c777203 into mom-ocean:dev/gfdl Apr 26, 2018
@adcroft adcroft deleted the gitlab-test-without-libraries branch April 30, 2018 15:30
Hallberg-NOAA pushed a commit to Hallberg-NOAA/MOM6 that referenced this pull request Jan 29, 2025
* Add option to set tracer advection timestep

Add an option to seperate the tracer advection from the diabatic
processes in MOM_step_thermo. Previously the advection and
diabatic codes were seperated but called with the same timestep.
If DT_TADVECT is not specified, then DT_THERM is used.
The comments describing DT_THERM and DT_TADVECT have been modified
to refelect this change.

* Add error warning if diabatic_first is true

Currently, this option is not intended to be used if diabatic_first is true,
so a fatal error flag has been added.
This will be addressed in a future pull request.

* Change variable, add do advection before thermo step

Change DT_TADVECT to DT_TRACER_ADVECT to be clearer. dt_tadvect
has been changed to dt_tr_adv and tadvect_spans_coupling to
tradv_spans_coupling.

An additional check has been added before the advection step.
If thermo_spans_coupling is true, do_advection is true if
t_dyn_rel_thermo is ~DT_THERM so that the thermodynamics step would
happen at the next possible time. This ensures that the
thermodynamics step is not prevented because advection has not been
resolved.

* Add logic to do_diabatic check

The do_diabatic check should only be done if do_thermo is true. This
is relevant when do_dyn or do_thermo are being used from outside
step_MOM to order the updates of the thermodynamics and dynamics,
such as when the interspesed coupling is used.

* Initialize do_diabatic

* Change TRADV_SPANS_COUPLING default

Change the default for TRADV_SPANS_COUPLING to be the same as
THERMO_SPANS_COUPLING, which is read first, instead of false.
Initialize do_advection.

* Doxygen fix

---------

Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea58.ncrc.gov>
Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea68.ncrc.gov>
Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea57.ncrc.gov>
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.

2 participants