Merge FMS dev/master into master #103
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
…ing with 32-bit real
…n_fluxes_init with -O2 in ocean/ice_null configuratin. When compiled with -O2 using ifort 15.0.3 20150408 (Mac OSX), the model would crash "malloc: pointer being freed was not allocated" at the end of atmos_ocean_fluxes_init, at least in the configuration when ocean_null and ice_null are used (and of course there are no ocean fluxes). Some investigation shows that apparently part of the loop is evaluated ahead by the optimized code (even though the body is not supposed to be executed), and the strings constructed by concatenation are not properly allocated or deallocated by the compiler.
The `get_cpu_affinity` function in `mpp/affinity.c` had two return lines that essentially resulted in only one possible return value `first_cpu`. This commite reduces the return statement to simply `return first_cpu`. Resolves #62.
…-history-file' into dev/master
This update returns -1 if set_cpu_affinity has an error. The error message is removed to allow the calling routine to report the error.
Two void functions in affinity.c were given return values. Updated the function prototype to return an int.
The preprocessor macro MPP_DO_GLOBAL_FIELD_A2A_3D_ was not being cleared before being redefined for the various data types, and was raising warnings on some builds. This patch clears these macros before redefining them.
Merge in latest GDFL updates
…8 that only pass the optional data_default_r4 argument to setup_one_field if it is initally passed to register_restart_field
…ault, FLOAT_KIND)
Corrected a typo in setup_one_field 'compressed_axis' argument in register_restart_field_r2d8.
…gkindofdoctor/FMS into dev/master
The previous travis environment used an outdated openMPI the did not have a new MPI API element. The travis enviornment now uses xenial with an openMPI library with the missing API. Other travis.yml cleanup was also done. Also found that fm_util.o file was not included in the final libFMS library. This has been corrected. The base test did not link in the library, added a no-op libFMS call to constants_init(), and modified the test Makefile.am to link in the library.
…_master_to_master_merge Resolved conflicts in affinity.c between changes in pull request #63 and version of affinity.c with apple #ifdefs
wrongkindofdoctor
added
the
enhancement
bensonr
previously approved these changes
Aug 2, 2019
|
@bensonr No new changes--I just need approval to re-submit the pull request because the gitlab CI jobs timed out during the first attempt. |
|
@underwoo FYI, the gitlab-CI jobs are hanging before timing out with the following message:
|
wrongkindofdoctor
requested review from
thomas-robinson
and removed request for
thomas-robinson
thomas-robinson
approved these changes
Aug 8, 2019
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.
This branch contains the most recent dev/master commits and affinity.c updates referenced in pull request #63 to merge into master so that users and developers can submit pull requests and issues directly to the master branch. Once this branch is merged, I will close #63 with a note that the affinity.c modifications have been applied in this pull request.