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

updates to nuopc cap #30

Merged
merged 10 commits into from
Mar 16, 2020
Merged

updates to nuopc cap #30

merged 10 commits into from
Mar 16, 2020

Conversation

mvertens
Copy link
Contributor

This PR only effects the NUOPC cap and brings in updates that accompany CMEPS updates.

Copy link
Contributor

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

It looks like the main purpose here is to add the handling of do_rtm and do_rtm_flood.

I have a couple questions. And a request for debug line of code.

src/cpl/nuopc/rof_comp_nuopc.F90 Outdated Show resolved Hide resolved
Copy link
Contributor

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

We need to add a nuopc test to the mosart testlist.

This is the test I think we should add...

diff --git a/cime_config/testdefs/testlist_mosart.xml b/cime_config/testdefs/testlist_mosart.xml
index b9c46f1..84a9bbf 100644
--- a/cime_config/testdefs/testlist_mosart.xml
+++ b/cime_config/testdefs/testlist_mosart.xml
@@ -50,6 +50,15 @@
       <option name="comment"  >Smoke test with DEBUG on all machines/compilers</option>
     </options>
   </test>
+  <test name="SMS_D_Ld5_Vnuopc" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/default">
+    <machines>
+      <machine name="cheyenne" compiler="intel" category="mosart"></machine>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment"  >Smoke test with DEBUG and NUOPC driver</option>
+    </options>
+  </test>
   <test name="SMS_D" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/decompOpts">
     <machines>
       <machine name="cheyenne" compiler="intel" category="mosart"></machine>

@mvertens
Copy link
Contributor Author

@ekluzek - I have added the changes you requested and pushed back to github. Can this PR move ahead?

@ekluzek
Copy link
Contributor

ekluzek commented Mar 11, 2020

Yes. Did you run the one nuopc test or should I do that?

@mvertens
Copy link
Contributor Author

@ekluzek - I am getting the same error with the correct tags. I will track this down. Thanks for doing this test.

@mvertens
Copy link
Contributor Author

@ekluzek - I am getting the same error using the older code base. It seems to be dying in a pio call.

@mvertens
Copy link
Contributor Author

@jedwards4b, @billsacks, @ekluzek - Backing up to pio1 fixed the problem - and the test ran successfully.
This still had the modifications to the PR for ncdio_pio.F90.in.
Its important to note that with mct as the coupling framework - the pio version out of the box is is pio1 NOT pio2. So this test will pass with pio1. I have verified that SMS_D_Vmct.f09_g17.I2000Clm50SpGs.cheyenne_intel crashes the same way as SMS_D_Vnuopc.f09_g17.I2000Clm50SpGs.cheyenne_intel when pio2 is used.

@jedwards4b
Copy link
Contributor

@mvertens Can we open a new issue regarding the failing test? SMS_D.f09_g17.I2000Clm50SpGs.cheyenne_intel (with mct and nuopc and pio2)
Can you tell if this a mosart issue or a CTSM one?

@mvertens
Copy link
Contributor Author

mvertens commented Mar 12, 2020 via email

@billsacks
Copy link
Member

@jedwards4b - I see you just pushed an additional fix to this branch. I'm going to start testing soon on this branch along with the corresponding nuopc_cap branches for rtm and ctsm. Do you plan to make any more changes to any of these branches?

@jedwards4b
Copy link
Contributor

@billsacks I don't anticipate any further changes at this time. Thanks!

The given test used CISM rather than SGLC, and failed (at least using
the externals present in CTSM: CISM master doesn't have a nuopc
cap). This new test is similar to the one we're adding in the aux_clm
test list.
@billsacks billsacks merged commit 266ae45 into master Mar 16, 2020
@billsacks billsacks deleted the nuopc_cap branch March 16, 2020 20:14
billsacks added a commit that referenced this pull request Apr 7, 2020
Updates to NUOPC cap

Main purpose is updates to NUOPC cap. Also a fix for PIO2.

Most changes are from Mariana Vertenstein, brought to master by Bill
Sacks.

These changes are documented in #30

Testing: mosart test suite (cheyenne & izumi), in the context of a CTSM
checkout (ESCOMP/CTSM#939). Baseline comparisons
done against ctsm1.0.dev085.
ekluzek added a commit to ekluzek/MOSART that referenced this pull request Jun 11, 2020
Updates to NUOPC cap

Main purpose is updates to NUOPC cap. Also a fix for PIO2.

Most changes are from Mariana Vertenstein, brought to master by Bill
Sacks.

These changes are documented in ESCOMP#30

Testing: mosart test suite (cheyenne & izumi), in the context of a CTSM
checkout (ESCOMP/CTSM#939). Baseline comparisons
done against ctsm1.0.dev085.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants