Merge pull request #64 from ESMCI/farrayptr_fix

med_map_RegridNorm refactor
E3SM-Project · Dec 11, 2018 · 1291848 · 1291848
2 parents 724524e + 5d4a8a6
commit 1291848
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 179 deletions.
diff --git a/scripts/testlist_cmeps.xml b/scripts/testlist_cmeps.xml
@@ -12,8 +12,8 @@
   </test>
   <test compset="ADWAV" grid="ww3a" name="SMS_Vmct_Ld2">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -31,8 +31,8 @@
   </test>
   <test compset="A1850DLND" grid="f09_f09_mg17" name="SMS_Vmct_Ld3">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -50,8 +50,8 @@
   </test>
   <test compset="BMOM" grid="f19_g16" name="SMS_Vmct_Ld5" testmods="allactive/nuopc_cap_io">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:40:00 </option>
@@ -70,8 +70,8 @@
 
   <test compset="CMOM" grid="T62_g16" name="SMS_Vmct_Ld5" testmods="mom/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -90,8 +90,8 @@
 
   <test compset="GMOM" grid="T62_g16" name="SMS_Vmct_Ld5" testmods="mom/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -110,8 +110,8 @@
 
   <test compset="DTEST" grid="T62_g37" name="SMS_Vmct_Ld5" testmods="cice/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -130,8 +130,8 @@
 
   <test compset="F2000Nuopc" grid="f19_g17" name="SMS_Vmct_Ln5" testmods="cam/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -150,8 +150,8 @@
 
   <test compset="X" grid="f19_g17" name="SMS_Vmct">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -168,7 +168,7 @@
     </options>
   </test>
 
-  <test compset="A" grid="f19_g17_rx1" name="SMS_Vmct_Ld1">
+  <test compset="A" grid="f19_g17_rx1" name="SMS_Vnuopc_Ln11_D">
     <machines>
       <machine name="cheyenne" compiler="intel" category="prealpha"/>
       <machine name="theia" compiler="intel" category="prealpha"/>
@@ -178,6 +178,16 @@
     </options>
   </test>
 
+  <test compset="A" grid="f19_g17_rx1" name="SMS_Vmct_Ld1">
+    <machines>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:10:00 </option>
+    </options>
+  </test>
+
   <test compset="I2000Clm50SpNuopc" grid="f45_f45_mg37" name="SMS_Vnuopc_Ln5" testmods="clm/nuopc_cap">
     <machines>
       <machine name="cheyenne" compiler="intel" category="prealpha"/>
@@ -190,8 +200,8 @@
 
   <test compset="I2000Clm50SpNuopc" grid="f45_f45_mg37" name="SMS_Vmct_Ln5" testmods="clm/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -210,8 +220,8 @@
 
   <test compset="QPC4" grid="ne16_ne16_mg17" name="SMS_Vmct_Ln5" testmods="cam/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -230,8 +240,8 @@
 
   <test compset="BMOM" grid="f19_g16" name="ERR_Vmct_Ld5" testmods="allactive/nuopc_cap_io">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:40:00 </option>
@@ -250,8 +260,8 @@
 
   <test compset="CMOM" grid="T62_g16" name="ERS_Vmct_Ld5" testmods="mom/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -270,8 +280,8 @@
 
   <test compset="GMOM" grid="T62_g16" name="ERS_Vmct_Ld5" testmods="mom/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -290,8 +300,8 @@
 
   <test compset="DTEST" grid="T62_g37" name="ERS_Vmct_Ld5" testmods="cice/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -310,8 +320,8 @@
 
   <test compset="F2000Nuopc" grid="f19_g17" name="ERS_Vmct_Ln5" testmods="cam/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -330,8 +340,8 @@
 
   <test compset="X" grid="f19_g17" name="ERS_Vmct_Ln9">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -350,8 +360,8 @@
 
   <test compset="A" grid="f19_g17_rx1" name="ERS_Vmct_Ln9">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -370,8 +380,8 @@
 
   <test compset="I2000Clm50SpNuopc" grid="f45_f45_mg37" name="ERS_Vmct_Ln5" testmods="clm/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>
@@ -390,8 +400,8 @@
 
   <test compset="QPC4" grid="ne16_ne16_mg17" name="ERS_Vmct_Ln5" testmods="cam/nuopc_cap">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-      <machine name="theia" compiler="intel" category="prealpha"/>
+      <machine name="cheyenne" compiler="intel" category="mctcheck"/>
+      <machine name="theia" compiler="intel" category="mctcheck"/>
     </machines>
     <options>
       <option name="wallclock"> 00:10:00 </option>