-
Notifications
You must be signed in to change notification settings - Fork 3
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
Add OASIS-coupling for CLM3.5-ParFlow-PDAF #40
Conversation
goal: have a new dedicated submodule
Testcases are now reproducing results from TSMP1 👍 I think this can be merged. Small thing bugging me: The old OASIS needs password authentication for the clone. However, I curently do not see a way around it. |
file(APPEND ${OASIS_MAKE_INC} "CPPDEF = -Duse_netCDF -Duse_comm_$(CHAN) -D__VERBOSE -DTREAT_OVERLAY -DUSE_PDAF\n") | ||
|
||
|
||
if(${CLM3.5}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can try to disable this when compiling with OASIS3-MCT v5. I think the default make.inc
should work for all component models.
Hey @kvrigor thanks for the review. Actually compilation worked with CLM3.5-ParFlow-PDAF with OASI3-MCT v5 also before this PR. There were runtime errors in the PDAF-testcase clm3_pfl_pdaf_fsday4. These are then most likely in connection to PDAF-related pre-patching. As I think we should not invest too much time into CLM3.5, what I could do is to put all conditions, where I change things for CLM3.5 to actually only change for CLM3.5+PDAF. Then my testcases run and non-DA CLM3.5-ParFlow will be compiled as before!? I did not realize there were still testcases for CLM3.5-PDAF that I interfere with! FYI: Runtime error of
|
Closing this PR as CLM3.5-ParFlow-PDAF was successfully run with OASIS3-MCT-v5 after adding Taking this into account, this PR boils down to the small fix presented in #41 |
This is a follow-up on #39
In #39, CLM3.5-PDAF / CLM3.5-ParFlow-PDAF could be compiled.
However, there were errors in executing the CLM3.5-ParFlow-PDAF Testcase
clm3_pfl_pdaf_fsday4
related to the OASIS-coupler and in particular the fact that the CLM3.5-ParFlow coupling is performed with an older version of the coupler.I try to tackle the issue with this PR. My goal: That I can perform my PDAF-testcase-suite completely in the TSMP2 framework.
This is a big step towards moving all PDAF-related users from TSMP1 to TSMP2.
Changes
These changes only work in combination with OASIS3-MCT-v2.0, pre-patched for PDAF from the branch https://icg4geo.icg.kfa-juelich.de/ModelSystems/tsmp_src/oasis3-mct/-/tree/oasis3-MCT_2.0-pdaf-patched
oasis3-mct-clm35
for software OASIS3-MCT-v2 that is patched for CLM3.5-ParFlow-PDAFbuild_tsmp2.sh
: Small fix indwn_compsrc()
, regarding the condition, when to download ParFlow fromparflow_pdaf
or OASIS3-MCT fromoasis3-mct-clm35
BuildCLM3.5.cmake
: Add include directory for OASIS3-MCT-v2 modulesBuildOASIS3MCT.cmake
: Add completely remodelledmake.inc
for OASIS3-MCT-v2 (modelled after https://github.com/HPSCTerrSys/TSMP/blob/master/bldsva/intf_oas3/oasis3-mct/arch/config/make.intel_oa3 )BuildOASIS3MCT.cmake
: Adaptingmake
-target, whenCLM3.5
is used