Continuous merge of release/v16.0.0 into develop #139
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ification makes them periodic. This case is meant to have periodic boundary condition in x and y direction.
1) toteq has been moved to SIZE
- makenek.inc will search for toteq, if not found, declares toteq=1 when IFCMT=.false. or 5 when IFCMT=.true.
NOTE that if the user uses a SIZE from a cmt-nek case to run a nek5000 example then makenek will not modify toteq !
2) CMTSIZE is removed from examples, all the parameters in CMTSIZE are declared in CMTDATA
3) CMT trunk has been modified. LELT and LELV have been replaced by LELCMT.
This modification ensures that when the user is running nek5000 then I can set LELCMT=1 and the memory footprint of cmt-nek
will be minimized. LELCMT is set by makenek.inc. The procedure is same as that used to set toteq.
4) cmt directory now resides inside nek
5) Fixed an error in makefile.template, CMT_CORE is always included in the list of object files.
Following is a summary of the changes
…he examples (prevent having to fetch code from nek5000 repo)
Added tools from nek5000 into a tools folder since they are used in the examples (prevent having to fetch code from nek5000 repo)
…ment work which is initially a copy of the swep_particles example. cmt_cases is meant to be cases in development rather than complete examples.
Started charles_particles case from swept particles
appended few more excursions to the gitignore file
… have been moved inside examples folder. To access cmt examples look in examples/CMT/ All the nek5000 examples are also added to this repo for the convenience of developers and users at CCMT.
certainly the right way to do nonlinear DG in nek5000 with Patera elements. Extensive testing must precede an SVN commit, or even a push to bitbucket.org/ccmt/master
…I ever use" This reverts commit c219fa1.
undoing failed conflict resolution in core/ic.f
Merge pull request #22 from hackljf/cmt-merge-2
Merge pull request #23 from hackljf/cmt-merge-2
…into cmt-merge-2 Conflicts: core/ic.f
…solve. I will not have time to deal with it until after the CCMT tri-lab services Team review on December 2. CMT tests skipped for now. commits before 11/23/2016 are trustworthy to CMT-nek.
fixed ic.f conflicts, but CMT/invscid_vortex now fails subtly. I have accepted defeat and turned off this test in .travis.yml. I trust my code, but I will not have time to decipher what, exactly "Lee's restart" and extra setup_convect(2) that I am sure I skipped have done to make my exemplary example stop working until after December 2
CMT merge
Add adjoint for passive scalar (just T) #88
2D smoother in prenek
|
@RonRahaman Can merge in the latest changes of release/v16.0.0? |
Correct PPLIST when IFPROFILING=true and IFMPI=false
update prenek/glomod.f to include missing col2 subroutine
Exclude serial tests when IFMPI=true
Support for 'o' and 'on' boundary conditions added to non-stress formulation.
fix some compiler warnings
RonRahaman
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We are merging the current state of release/v16.0.0 into master so users of master can benefit from the extensive bugfixes. You can think about this as a release candidate prior to the stable release.
cc: @stgeke