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

merge latest develop #32

Merged
merged 8 commits into from
May 23, 2020
Merged

merge latest develop #32

merged 8 commits into from
May 23, 2020

Conversation

DeniseWorthen
Copy link
Owner

No description provided.

MinsukJi-NOAA and others added 8 commits April 27, 2020 09:26
* support for ufs-s2s-model debug compilaiton

* automatically enable NEMS_BUILDOPT=DEBUG=Y based on coupledFV3_MOM6_CICE_debug.appBuilder
* automatically use esmf/8.0.0g module based on coupledFV3_MOM6_CICE_debug.appBuilder

* Change debug flag check from ifeq to findstring

* Loading machine-dependent esmf debug module

*Remove the previous approach of auto-loading esmf debug module
*Use S2S_DEBUB_MODULE env var to load machine-dependent esmf debug module
*Require ufs-s2s-model/modules/${BUILD_TARGET}/fv3_coupled_debug file
support for ufs-s2s-model debug compilaiton (NOAA-EMC#40)
* Bring in CMEPS

* updates to get remove CMEPS #ifdefs as much as possible

* fixed compilation bug for NEMS

* fixed problem with updates to nuopc dictionary in nems mode

* simplified removal of CMEPS in module_EARTH_GRID_COMP.F90

* fixed problem with latent heat flux

* fix divide by zero

* remove ice-ocean merge in prep_atm

* these are the changes that are consistent with the latest cmeps branch mvertens/nems_integration2_update3 that currently has a PR to cmeps master

* update pyprodutil

* updates to be consistent w/ latest s2s & cmeps

* update default values in MAIN_NEMS and module_NEMS_GRID_COMP

Co-authored-by: Mariana Vertenstein <[email protected]>
* fix in prep_ocn for datm when i2a phase does not exist

* Add Orion to module-setup.*.inc

Co-authored-by: Denise Worthen <[email protected]>
Co-authored-by: Denise Worthen <[email protected]>
Bugfix i2a & Add Orion to module-setup (NOAA-EMC#61)
@DeniseWorthen DeniseWorthen merged commit 1f71a28 into feature/buildCICE6 May 23, 2020
DeniseWorthen pushed a commit that referenced this pull request Jun 19, 2020
* Set default values for model_configure variables (#18)

RUN_CONTINUE = .false.
 ENS_SPS = .false.
 TOTAL_MEMBER = 1

* fixes problem with MPI_Comm_Split in openmpi when hash is negative

* removed redundant check on hash > 0

* Add GNU LPGL (#32)

* Add NEMS documentation (#33)

* Add nems documentation in doc directory

*Include in .gitignore NEMS/doc/html/ and NEMS/doc/webpage.tar.gz
*Remove milestones.dox which is no longer needed
*Modify Makefile to include doxygen command on Hera
*Remove in prep_inputs.py two functions related to milestones

* Remove webpage.tar.gz file

* Update NEMS documentation

*Add Doxyfile in NEMS/.gitignore

* Update based on documentation meeting

* Updates to the documentation (NOAA-EMC#35)

* Documentation update (NOAA-EMC#36)

* Modify license file (NOAA-EMC#37)

* Modify license file

* Fix typo in license

Co-authored-by: Dusan Jovic <[email protected]>
Co-authored-by: Mark A. Potts <[email protected]>
Co-authored-by: Mark Potts <[email protected]>
Co-authored-by: Mark Potts <[email protected]>
Co-authored-by: arun chawla <[email protected]>
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.

3 participants