diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml index 7782291e66c..a3f594d104a 100644 --- a/config/acme/allactive/config_pesall.xml +++ b/config/acme/allactive/config_pesall.xml @@ -5973,7 +5973,7 @@ - + none @@ -6009,6 +6009,43 @@ + + + + T62_oQU120 grid for MPAS tests on 1024 nodes pure-MPI + + 1024 + 1024 + 1024 + 1024 + 1024 + 1024 + 1024 + 1024 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml index 91039fc856f..93b769a9c7c 100644 --- a/config/acme/machines/config_compilers.xml +++ b/config/acme/machines/config_compilers.xml @@ -1193,7 +1193,7 @@ for mct, etc. -qopenmp -qopenmp -qopenmp - $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -mkl + $(shell nf-config --flibs) -mkl -DHAVE_SLASHPROC mpiifort mpiicc diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml index 146cd315750..0bc12cdcca9 100644 --- a/config/acme/machines/config_machines.xml +++ b/config/acme/machines/config_machines.xml @@ -1157,6 +1157,9 @@ -n $TOTALPES + + + /home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/sh /home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/csh @@ -1183,11 +1186,12 @@ cmake netcdf/4.4.1.1-prsuusl netcdf-fortran/4.4.4-ojwazvy - parallel-netcdf/1.8.1 + parallel-netcdf/1.6.1 - $SHELL{which nf-config | xargs dirname | xargs dirname} + $SHELL{which nc-config | xargs dirname | xargs dirname} + $SHELL{which nf-config | xargs dirname | xargs dirname} $SHELL{which pnetcdf_version | xargs dirname | xargs dirname} /lcrc/group/acme/soft/perl/5.26.0/bin:$ENV{PATH}