-
Notifications
You must be signed in to change notification settings - Fork 2
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
Incorporate the Ftorch branch into the CAM-Interface branch #63
base: main
Are you sure you want to change the base?
Conversation
Currently there is a memory error |
I used
I commented out this line and its following line and now @jatkinson1000 Are these lines supposed to be kept (so |
Summary:
This branch aims to integrate Elliot's
ftorch
branch with Jack'scam-interface
branch. The key changes involve resolving conflicts betweentest.f90
andnn_convection_flux.f90
. To address these conflicts,test.f90
is being rewritten to align with the latest version ofnn_convection_flux.f90
from Jack's branch.Progress:
test.f90
andnn_convection_flux.f90
test.f90
based on Jack'snn_convection_flux.f90
test.f90
Details:
The integration of Elliot's
ftorch
branch and Jack'scam-interface
branch has been a challenging task due to conflicting changes intest.f90
andnn_convection_flux.f90
. To resolve these conflicts, a thorough understanding of the intended functionality innn_convection_flux.f90
is required, as this module is a dependency fortest.f90
.The current approach is to rewrite
test.f90
from scratch, ensuring it aligns with the latest version ofnn_convection_flux.f90
from Jack's branch. This will involve implementing new tests to verify the correct behavior of the integrated code.Once the conflicts are resolved and the project builds successfully, additional tests will be added to
test.f90
to ensure the new functionality is thoroughly covered.Review Notes:
Reviewers should focus on the changes made to
test.f90
and its interactions withnn_convection_flux.f90
. Particular attention should be given to the correctness of the new tests and their coverage of the intended functionality.