Merge branch 'master' into dev-add-params

cmake/SetBuildOptions.cmake

@@ -35,7 +35,7 @@ elseif(COMPILER STREQUAL "Intel" OR COMPILER STREQUAL "IntelLLVM")
     set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
     set(CMAKE_C_FLAGS_RELEASE "-O2 -debug minimal")
     set(CMAKE_Fortran_FLAGS "-free -qno-opt-dynamic-align -ftz -traceback -convert big_endian -assume byterecl -assume realloc_lhs -fp-model source -qopenmp")
-    set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fpe0 -check all")
     set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal")
 else()
     message(FATAL_ERROR "COMPILER='${COMPILER}' is not supported.")

src/eclm/cime_comp_mod.F90

@@ -661,18 +661,23 @@ subroutine cime_pre_init1(esmf_log_option)
 #ifdef USE_PDAF
       call shr_sys_abort( subname//':: num_inst_driver > 1'// &
         ' not supported for PDAF' )
-#endif
+#else
        call seq_comm_init(global_comm, driver_comm, NLFileName, drv_comm_ID=driver_id)
        write(cpl_inst_tag,'("_",i4.4)') driver_id
-#ifdef USE_PDAF
-    else if (present(pdaf_id) .and. present(pdaf_max)) then
-       call seq_comm_init(global_comm, driver_comm, NLFileName, &
-                          pdaf_id=pdaf_id, pdaf_max=pdaf_max)
-       cpl_inst_tag = ''
 #endif
     else
+#ifdef USE_PDAF
+      if (present(pdaf_id) .and. present(pdaf_max)) then
+        call seq_comm_init(global_comm, driver_comm, NLFileName, pdaf_id=pdaf_id, pdaf_max=pdaf_max)
+        cpl_inst_tag = ''
+      else
+        call shr_sys_abort( subname//':: pdaf_id and pdaf_max'// &
+          ' have to be present for PDAF' )
+      end if
+#else
        call seq_comm_init(global_comm, driver_comm, NLFileName)
        cpl_inst_tag = ''
+#endif
     end if
 
     !--- set task based threading counts ---