Merge pull request #776 from GEOS-ESM/hotfix/wjiang/counting_backend

fixed counting the number of backend processes
GEOS-ESM · Mar 25, 2021 · 3e272aa · 3e272aa
2 parents 7cdd427 + b9eec51
commit 3e272aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix size of unallocated array for gfortran
+- Fixed size of unallocated array for gfortran
+- Fixed counting of backend npes for assert
 
 ### Removed
 

diff --git a/base/ServerManager.F90 b/base/ServerManager.F90
@@ -104,10 +104,10 @@ subroutine initialize(this, comm, unusable, application_size, nodes_input_server
       if (present(isolate_nodes)) isolated_ = isolate_nodes
 
       if (oserver_type_ == "multilayer" .or. oserver_type_ == 'multigroup') then
-         _ASSERT(npes_out_backend >=2, "captain-soldier need at lease two beckend")
+         _ASSERT(nodes_out(1)*npes_out_backend >=2, "captain-soldier needs at least two backend")
       endif
       if (oserver_type_ == "multicomm") then
-         _ASSERT(npes_out_backend >=1, "need at lease one beckend for multicomm server")
+         _ASSERT(npes_out_backend >=1, "needs at least one backend for multicomm server")
       endif