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

Various fixes required on CSD3 #41

Merged
merged 10 commits into from
Sep 16, 2024
Merged

Various fixes required on CSD3 #41

merged 10 commits into from
Sep 16, 2024

Conversation

jwallwork23
Copy link
Collaborator

Whilst trying to get GISS-GC working on the CSD3 platform at Cambridge, I've come across several issues. The ones that should be merged back into the code are included here. Other more "hacky" fixes and debug prints can be found on the csd3-debug branch.

Some of the changes are due to the fact I am using a recent Intel compiler.

@jwallwork23 jwallwork23 added the bug Something isn't working label Sep 12, 2024
@jwallwork23 jwallwork23 self-assigned this Sep 12, 2024
@jwallwork23 jwallwork23 force-pushed the csd3-fixes branch 2 times, most recently from b8e54a3 to bab8c2e Compare September 12, 2024 15:37
Comment on lines +46 to +52

# Check for later versions of the Intel compiler which have a different pattern
# for --version
ifeq ($(VER_MAJOR),for)
LIBS += -lmpifort -lmpi
# Check for some other versions
else ifneq (,$(filter 7 8 9 10,$(VER_MINOR))$(filter 2 3 4,$(VER_MAJOR)))
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Perhaps we could reuse these version switches in the config/compiler.intel.mk edit above.

@ltmurray ltmurray merged commit 863cfdc into develop Sep 16, 2024
2 checks passed
@jwallwork23
Copy link
Collaborator Author

Thanks @ltmurray.

@AdelekeBankole this means you can now use the develop branch with GISS-GC as well (as opposed to csd-fixes branch).

@jwallwork23 jwallwork23 deleted the csd3-fixes branch September 16, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants