Fixes to get tests to pass.

scripts_regression_tests pass acme_developer has 1 remaining fail: HOMME_P24.f19_g16_rx1.A Changes: HOMME and cprnc CMakeFile fixes Undo mct_mod change that broke CLM build Remove unused <list>1<\list> in /clm/cime_config/config_component.xml Removed redundant MPASLI entries in env_run.xml Resolve conflict in update_acme_tests.py that was missed
ESMCI · Apr 14, 2017 · 8994015 · 8994015
1 parent 0d97ff3
commit 8994015
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 47 deletions.
diff --git a/cime/scripts/lib/CIME/aprun.py b/cime/scripts/lib/CIME/aprun.py
@@ -30,10 +30,10 @@ def _get_aprun_cmd_for_case_impl(ntasks, nthreads, rootpes, pstrids,
     >>> machine = "titan"
     >>> run_exe = "acme.exe"
     >>> _get_aprun_cmd_for_case_impl(ntasks, nthreads, rootpes, pstrids, max_tasks_per_node, pes_per_node, pio_numtasks, pio_async_interface, compiler, machine, run_exe)
-    'aprun -S 4 -n 680 -N 8 -d 2 acme.exe : -S 2 -n 128 -N 4 -d 4 acme.exe '
+    ('aprun -S 4 -n 680 -N 8 -d 2 acme.exe : -S 2 -n 128 -N 4 -d 4 acme.exe ', 117)
     >>> compiler = "intel"
     >>> _get_aprun_cmd_for_case_impl(ntasks, nthreads, rootpes, pstrids, max_tasks_per_node, pes_per_node, pio_numtasks, pio_async_interface, compiler, machine, run_exe)
-    'aprun -S 4 -cc numa_node -n 680 -N 8 -d 2 acme.exe : -S 2 -cc numa_node -n 128 -N 4 -d 4 acme.exe '
+    ('aprun -S 4 -cc numa_node -n 680 -N 8 -d 2 acme.exe : -S 2 -cc numa_node -n 128 -N 4 -d 4 acme.exe ', 117)
     """
     max_tasks_per_node = 1 if max_tasks_per_node < 1 else max_tasks_per_node
 

diff --git a/cime/scripts/lib/update_acme_tests.py b/cime/scripts/lib/update_acme_tests.py
@@ -118,10 +118,7 @@
                          "SMS_D_Ln5.ne16_ne16.F1850C5AV1C-04",
                          "SMS_D_Ln5.ne16_ne16.F20TRC5AV1C-03",
                          "SMS_D_Ln5.ne16_ne16.FC5AV1C-04P",
-<<<<<<< HEAD
                          "SMS_D_Ln5.ne4_ne4.FC5AV1C-04P2",
-=======
->>>>>>> 6156e0a02185bffaae8deaf07e539b358d8361f2
                          "SMS_D_Ld1.ne16_ne16.FC5ATMMOD")
                         ),
 
@@ -156,10 +153,7 @@
                            "ERS_Ld5.ne30_oEC.F1850C5AV1C-02",
                            "ERS_Ld5.ne16_ne16.F1850C5AV1C-04",
                            "ERS_Ld5.ne16_ne16.F20TRC5AV1C-03",
-<<<<<<< HEAD
                            "ERP_Ld5_P8x4.ne4_ne4.FC5AV1C-04P2",
-=======
->>>>>>> 6156e0a02185bffaae8deaf07e539b358d8361f2
                            "SMS_D_Ld1.ne16_ne16.FC5ATMMODCOSP")
                           ),
 }

diff --git a/cime/src/drivers/mct/bld/testdir/env_run.xml b/cime/src/drivers/mct/bld/testdir/env_run.xml
@@ -1215,7 +1215,7 @@
     <entry id="CLM_CO2_TYPE" value="diagnostic">
       <type>char</type>
       <valid_values>constant,diagnostic,prognostic</valid_values>
-      <list>1</list>
+      <!--list>1</list-->
       <desc>Determines how CLM will determine where CO2 is set.
       If value is constant, it will be set to CCSM_CO2_PPMV,
       if value is either diagnostic or prognostic, the atmosphere model

diff --git a/cime/src/drivers/mct/cime_config/config_component.xml b/cime/src/drivers/mct/cime_config/config_component.xml
@@ -2512,33 +2512,6 @@
       machines/compilers.</desc>
   </entry>
 
-  <entry id="MPASLI_CONFIG_OPTS">
-    <type>char</type>
-    <valid_values></valid_values>
-    <default_value></default_value>
-    <group>build_component_mpasli</group>
-    <file>env_build.xml</file>
-    <desc>MPASLI configure options. Currently not used</desc>
-  </entry>
-
-  <entry id="MPASLI_USE_ALBANY">
-    <type>logical</type>
-    <valid_values>TRUE,FALSE</valid_values>
-    <default_value>FALSE</default_value>
-    <group>build_component_mpasli</group>
-    <file>env_build.xml</file>
-    <desc>TRUE implies MPASLI is built with support for the Albany
-      library The first-order velocity solver in MPASLI uses the
-      Albany library.  In order to use that velocity solver, MPASLI
-      must be built with Albany support and linking to Albany must
-      occur when building the ACME executable.  This occurs if this
-      variable is set to TRUE.  Note that is only available on a
-      limited set of machines/compilers.  This must remain FALSE to
-      run MPASLI on a machine that does not have Albany, or for which
-      the CIME scripts are not aware of the existence of
-      Albany.</desc>
-  </entry>
-
   <!-- Prerun/postrun custom script options -->
 
   <entry id="PRERUN_SCRIPT">

diff --git a/cime/src/share/util/mct_mod.F90 b/cime/src/share/util/mct_mod.F90
@@ -98,6 +98,7 @@ module mct_mod
    use m_GlobalSegMap       ,only: mct_gsMap_gstorage     => GlobalStorage
    use m_GlobalSegMap       ,only: mct_gsMap_ngseg        => ngseg
    use m_GlobalSegMap       ,only: mct_gsMap_nlseg        => nlseg
+   use m_GlobalSegMap       ,only: mct_gsMap_OP           => OrderedPoints
    use m_GlobalSegMap       ,only: mct_gsMap_maxnlseg     => max_nlseg
    use m_GlobalSegMap       ,only: mct_gsMap_activepes    => active_pes
    use m_GlobalSegMap       ,only: mct_gsMap_copy         => copy

diff --git a/cime/tools/cprnc/CMakeLists.txt b/cime/tools/cprnc/CMakeLists.txt
@@ -1,21 +1,22 @@
 PROJECT(CPRNC C Fortran)
 
+
+execute_process(COMMAND ../configure --macros-format=CMake WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "$ENV{CIMEROOT}/src/externals/CMake")
+
 INCLUDE(Macros.cmake)
-set(CMAKE_Fortran_FLAGS, ${CIME_FFLAGS})
-set(CMAKE_FC, CIME_SFC)
 
 ENABLE_LANGUAGE(Fortran)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} $ENV{CIME_ROOT}/src/externals/pio2/cmake)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} $ENV{CIMEROOT}/src/externals/pio2/cmake)
 
 # Defining NETCDF_LIBRARIES and NETCDF_INCLUDE_DIR enables bypassing
 #   the search for Netcdf
 IF (NOT DEFINED NETCDF_LIBRARIES OR NOT DEFINED NETCDF_INCLUDE_DIR)
-  FIND_PACKAGE(NetCDF REQUIRED)
-  SET(NETCDF_INCLUDE_DIR ${Netcdf_INCLUDE_DIR})
-  SET(NETCDF_LIBRARIES ${Netcdf_LIBRARIES})
+  SET(NETCDF_INCLUDE_DIR ${NETCDF_PATH}/include)
+  SET(NETCDF_LIBRARIES ${NETCDF_PATH}/lib/libnetcdff.a)
 ENDIF ()
 
 ADD_CUSTOM_COMMAND(

diff --git a/components/clm/cime_config/config_component.xml b/components/clm/cime_config/config_component.xml
@@ -114,7 +114,7 @@
   <entry id="CLM_CO2_TYPE">
     <type>char</type>
     <valid_values>constant,diagnostic,prognostic</valid_values>
-    <list>1</list>
+    <!--list>1</list-->
     <default_value>constant</default_value>
     <values>
       <value compset="_CAM.*_CLM"     >diagnostic</value>

diff --git a/components/homme/CMakeLists.txt b/components/homme/CMakeLists.txt
@@ -146,27 +146,27 @@ IF (${ENABLE_NANOTIMERS})
     ADD_DEFINITIONS(-DBIT64)
   ENDIF ()
 ENDIF ()
-ADD_SUBDIRECTORY(utils/cime/share/timing)
+ADD_SUBDIRECTORY(utils/cime/src/share/timing)
 
 
 # Use CIME's FindNETCDF path
 # CMAKE_CURRENT_SOURCE_DIR == homme
 SET (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
-SET (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/utils/cime/externals/CMake" ${CMAKE_MODULE_PATH})
+SET (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/utils/cime/src/externals/CMake" ${CMAKE_MODULE_PATH})
 FIND_PACKAGE(NETCDF)
 
 # These are needed for pio's FindNetCDF
 SET(NetCDF_PATH ${NETCDF_DIR})
 SET(PnetCDF_PATH ${PNETCDF_DIR})
 
 # pio needs cime/externals/genf90/genf90.pl
-SET(GENF90_PATH ${CMAKE_CURRENT_SOURCE_DIR}/utils/cime/externals/genf90)
+SET(GENF90_PATH ${CMAKE_CURRENT_SOURCE_DIR}/utils/cime/src/externals/genf90)
 
 # For pio - allow the user to set HDF5_DIR to find libhdf5 etc.
 IF (HDF5_DIR)
   SET(ENV{HDF5_ROOT} ${HDF5_DIR})
 ENDIF ()
-ADD_SUBDIRECTORY(utils/cime/externals/pio1)
+ADD_SUBDIRECTORY(utils/cime/src/externals/pio1)
 
 # CPRNC locations
 SET (CPRNC_INSTALL_DIR ${CMAKE_BINARY_DIR}/utils/cime/tools/cprnc)