correct problems in nck test

E3SM-Project · Jul 17, 2016 · d9b7302 · d9b7302
1 parent e681111
commit d9b7302
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/cime_config/cesm/allactive/testmods_dirs/allactive/cism/test_coupling/include_user_mods b/cime_config/cesm/allactive/testmods_dirs/allactive/cism/test_coupling/include_user_mods
@@ -1 +1 @@
-../../default_io
+../../defaultio
diff --git a/utils/python/CIME/SystemTests/nck.py b/utils/python/CIME/SystemTests/nck.py
@@ -38,14 +38,13 @@ def build(self, sharedlib_only=False, model_only=False):
             machpes = os.path.join("LockedFiles","env_mach_pes.NCK%s.xml"%bld)
             for comp in ['ATM','OCN','WAV','GLC','ICE','ROF','LND']:
                 self._case.set_value("NINST_%s"%comp, bld)
-                if(bld == 2):
-                    ntasks      = self._case.get_value("NTASKS_%s"%comp)
-                    rootpe      = self._case.get_value("ROOTPE_%s"%comp)
+                ntasks      = self._case.get_value("NTASKS_%s"%comp)
+                if(bld == 1):
                     if ( ntasks > 1 ):
-                        self._case.set_value("NTASKS_%s"%comp, ntasks/2)
-                        self._case.set_value("ROOTPE_%s"%comp, rootpe/2)
-                    else:
-                        self._case.set_value("NTASKS_%s"%comp, 2)
+                        self._case.set_value("NTASKS_%s"%comp, int(ntasks/2))
+                else:
+                    self._case.set_value("NTASKS_%s"%comp, ntasks*2)
+
             self._case.flush()
 
             case_setup(self._case, test_mode=True, reset=True)