Merge branch 'master' into dev-perturbation

README.md

@@ -5,14 +5,15 @@ https://gitlab.jsc.fz-juelich.de/detect/cluster-c/c01/perturbationroutineclm5
 # eCLM
 
 [![CI](https://github.com/HPSCTerrSys/eCLM/actions/workflows/CI.yml/badge.svg)](https://github.com/HPSCTerrSys/eCLM/actions/workflows/CI.yml)
-[![status: alpha](https://img.shields.io/badge/status-alpha-yellow)](https://github.com/HPSCTerrSys/eCLM)
+[![docs](https://github.com/HPSCTerrSys/eCLM/actions/workflows/docs.yml/badge.svg)](https://github.com/HPSCTerrSys/eCLM/actions/workflows/docs.yml)
+[![latest tag](https://badgen.net/github/tag/HPSCTerrSys/eCLM)](https://github.com/HPSCTerrSys/eCLM/tags)
 
 eCLM is based from [Community Land Model 5.0 (CLM5.0)]. It has the same modelling capabilities as CLM5 but with a more simplified infrastructure for build and namelist generation. The build system is handled entirely by CMake and namelists are generated through a small set of Python scripts. Only Fortran source codes necessary for a functional land model simulation were imported from CLM5. 
 
 Unlike CLM5, there are no built-in batch scripts in eCLM. It is up to system maintainers or users to craft their own workflows by combining the basic tools in this repo plus the native tools in their respective platforms.
 
 > [!WARNING]
-> eCLM is still experimental and has been undergoing extensive testing. Use it at your own risk!
+> eCLM is still experimental and being extensively tested. Use it at your own risk!
 
 ## Usage
 

docs/_config.yml

@@ -28,7 +28,7 @@ sphinx:
 repository:
   url: https://github.com/HPSCTerrSys/eCLM  # Online location of your book
   path_to_book: docs    # Optional path to your book, relative to the repository root
-  branch: docs-initial  # Which branch of the repository should be used when creating links (optional)
+  branch: master        # Which branch of the repository should be used when creating links (optional)
 
 # Add GitHub buttons to your book
 # See https://jupyterbook.org/customize/config.html#add-a-link-to-your-repository
@@ -37,4 +37,4 @@ html:
   use_repository_button: true
 
 # Do not parse these files
-exclude_patterns: [FORD_options.md, README.md]
+exclude_patterns: [FORD_options.md, README.md]

src/eclm/cime_comp_mod.F90

@@ -658,16 +658,26 @@ subroutine cime_pre_init1(esmf_log_option)
     !   if (Global_comm /= MPI_COMM_NULL) then
 
     if (num_inst_driver > 1) then
+#ifdef USE_PDAF
+      call shr_sys_abort( subname//':: num_inst_driver > 1'// &
+        ' not supported for PDAF' )
+#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)
 #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 ---