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.

Sign up for GitHub

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

Jump to bottom

CMake build for S2S: Successful Compile/Build #182

Closed
wants to merge 53 commits into from
Closed

CMake build for S2S: Successful Compile/Build #182

wants to merge 53 commits into from

Conversation

BrianCurtis-NOAA
Copy link
Collaborator

@BrianCurtis-NOAA BrianCurtis-NOAA commented Sep 15, 2020 •
edited
Loading

Description of changes

Brought over CMake from ufs-weather-model feature/s2s_cmake
Fixes for BUILD_INTERFACE
Cleaned up CMakeLists.txt between -weather and -s2s. Added script to …
rename build.sh to build_cmake.sh for a handy build test script, crea…
Typo in OpenMP CMake call
Edit compile_cmake to include MOM6/CICE6/CMEPS build options and use …
Added FindPIO.cmake to transition CICE from its internal PIO build
Fix for -qopenmp call using MOM6, bringing tests_cmake dir for CMake …
Fixes for using tests_cmake dir
CICE CMake fixes
NEMS.exe include
MOM6 had extra file, cleaned up to match MOM6 GMake flow better, test…
Don't need fv3_stack now that fv3 has stack as default
ESMF VERSION MAJOR/MINOR missing from CMEPS
Fixed merge conflict from upstream: updated modulefiles fv3 to include pio
Matching GMake compiler flags in CMake
Cleanup of CICE/MOM6 CMakeLists.txt

Specific notes

To JUST build with CMake:
module use modulefiles/orion.intel
module load fv3
./build_cmake.sh
-This PR does not address regression testing.

Issues Fixed (include github issue #):
#94 #95

Are changes expected to change answers?

  • bit for bit answers should NOT change
  • more substantial answers should NOT change

Specific changes:

  • changes in parm directory: No.
  • changes in module files: Yes. Creation of fv3_stack for orion.intel to use hpc-stack
  • new tests added or removed: Yes. Specific test files for S2S (will unify with -weather later)

Testing performed:

  • machines: orion, hera
  • This PR is not meant to address regression testing yet.

Hashes used for testing:

  • NEMS: 9d05172
  • CMEPS: 5e63bd4
  • FV3: 0975bb6
  • MOM6: eb58a2e
  • CICE6: 285985c
  • WW3: 96e3f3a
  • FMS: f61416f
  • stochastic_physics: a8e2cc1

Co-authored by:
@aerorahul

aerorahul
aerorahul requested changes Sep 16, 2020
View reviewed changes
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FIrst pass at the code.

@BrianCurtis-NOAA
* Added FindPIO.cmake to transition CICE from its internal PIO build
943f697 
* Cleaned up CMakeLists.txt
* Added S2S=y for any calls to CICE6/MOM6/CMEPS in compile_cmake.sh
* Removed affinity from fms_files
* Renamed ufs-weather-model-lib to ufs
* Renamed nuopccie to cice
* Renamed nuopcmom6 to mom6
* Removed fms dependency in NEMS.exe since it's already a dependency in ufs
* Closes #94 Port MOM6 to cmake
* Closes #95 Port CICE6 to cmake
@BrianCurtis-NOAA
Merge branch 'develop' of https://github.com/ufs-community/ufs-s2s-model
ce89550 
 into feature/unified_ufs
@BrianCurtis-NOAA
Merge branch 'develop' of https://github.com/ufs-community/ufs-s2s-model
c2cb499 
 into feature/unified_ufs
@BrianCurtis-NOAA
Fix for -qopenmp call using MOM6, bringing tests_cmake dir for CMake …
2d549b3 
…related RT's
@BrianCurtis-NOAA
Fixes for using tests_cmake dir
e488db4
@BrianCurtis-NOAA
CICE CMake fixes
6bc01c9
@BrianCurtis-NOAA
Merge branch 'develop' of https://github.com/ufs-community/ufs-s2s-model
8ff5612 
 into feature/unified_ufs
@BrianCurtis-NOAA
NEMS.exe include
1028fa0
@BrianCurtis-NOAA
MOM6 had extra file, cleaned up to match MOM6 GMake flow better, test…
f8a4954 
…s_cmake updates from S2S recent commit
@BrianCurtis-NOAA
Don't need fv3_stack not that fv3 has stack as default
d48922e
@BrianCurtis-NOAA
ESMF VERSION MAJOR/MINOR missing from CMEPS
e7699f3
@BrianCurtis-NOAA
Fixed merge conflict from upstream: updated fv3 to include pio
f7a5a9f
@BrianCurtis-NOAA
Matching GMake compiler flags in CMake
62a4858
@BrianCurtis-NOAA
Cleanup of CICE/MOM6 CMakeLists.txt
bc42f7c
@BrianCurtis-NOAA BrianCurtis-NOAA marked this pull request as ready for review September 23, 2020 16:34
BrianCurtis-NOAA
BrianCurtis-NOAA commented Sep 23, 2020
View reviewed changes
Copy link
Collaborator Author

@BrianCurtis-NOAA BrianCurtis-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes were made in more recent commits

@junwang-noaa
Copy link
Collaborator

@BrianCurtis-NOAA at one point in time, the parm directory would be updated with updates from ufs-weather-model when we updated the atm model. There were a few exceptions such as we have an extra variable in the model_configure (see: https://github.com/ufs-community/ufs-s2s-model/blob/develop/parm/model_configure.IN#L24) but I don't know if that's true or there has been further divergence more recently.

I don't think we need that line though. We need to do some cleanup.

@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Sep 24, 2020 •
edited
Loading

Is there really some reason to think we don't need the line in mode_configure which contains the fast coupling frequency? That was a fix from a long time ago that allowed us to run the different slow-fast coupling timesteps. It is read in FV3/cpl/module_cap_cpl.F90.

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented Sep 24, 2020 via email

aerorahul and others added 17 commits September 25, 2020 11:13
@aerorahul
wip: cleanup
23b556b
@aerorahul
wip: fix typo
4354578
@aerorahul
clean-up CICE interface CMakeLists.txt and ensure we can build this c…
f566520 
…omponent as a standalone one
@aerorahul
clean-up MOM6 interface CMakeLists.txt and ensure we can build this c…
6a3fdf1 
…omponent as a standalone one
@aerorahul
move CMEPS to CMEPS-interface
9d772d7
@aerorahul
Merge branch 'develop' into feature/unified_ufs-rm
f3fdd5b
@aerorahul
fix symbolic link for fd_nems.yaml
c69e590
@aerorahul
update modulefiles for PIO. The module should be in the proper place
ffa9ac5
@aerorahul
minor clean-up
75ea5b9
@aerorahul
bring branch uptodate with weather model
b0d0f79
@aerorahul
move build_cmake.sh to build.sh
f6053ec
@aerorahul
minor fixes
66b39e7
@aerorahul
fix typo
3c09513
@aerorahul
fix typo and remove make install from build
2f0051a
@BrianCurtis-NOAA
Brian in Rahul's cleanup work and merge with upstream/develop
6fb05e6
@BrianCurtis-NOAA
Merge branch 'feature/unified_ufs-rm' of https://github.com/BrianCurt…
3a59ae4 
…is-NOAA/ufs-s2s-model into feature/unified_ufs
@BrianCurtis-NOAA
Separated S2S build option into its components to allow for modularit…
81adf50 
…y in build
@BrianCurtis-NOAA
Copy link
Collaborator Author

Waiting on: NOAA-EMC/fv3atm#183 (comment) and NOAA-PSL/stochastic_physics#30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kgerheiser kgerheiser kgerheiser left review comments

@aerorahul aerorahul aerorahul requested changes

@DusanJovic-NOAA DusanJovic-NOAA Awaiting requested review from DusanJovic-NOAA

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@BrianCurtis-NOAA @JessicaMeixner-NOAA @aerorahul @junwang-noaa @DeniseWorthen @kgerheiser