Merge branch 'master' into test/slurm-constraint-error

Author: Vasileios Karakasis

cscs-checks/libraries/io/netcdf_compile_run.py

@@ -63,7 +63,24 @@ def setup(self, partition, environ, **job_opts):
                     '-lnetcdf', '-lnetcdf_c++4', '-lnetcdff'
                 ]
             elif environ.name == 'PrgEnv-pgi-nompi':
-                self.build_system.ldflags = ['-B' + self.linkage]
+                self.modules = ['netcdf/4.6.1-pgi-18.5-gcc-5.4.0-2.26',
+                                'netcdf-c++/4.3.0-pgi-18.5-gcc-5.4.0-2.26',
+                                'netcdf-fortran/4.4.4-pgi-18.5-gcc-5.4.0-2.26']
+                self.build_system.ldflags = [
+                    '-B' + self.linkage,
+                    '-L$EBROOTNETCDF/lib',
+                    '-L$EBROOTNETCDFMINCPLUSPLUS/lib',
+                    '-L$EBROOTNETCDFMINFORTRAN/lib',
+                    '-L$EBROOTNETCDF/lib64',
+                    '-L$EBROOTNETCDFMINCPLUSPLUS/lib64',
+                    '-L$EBROOTNETCDFMINFORTRAN/lib64',
+                    '-lnetcdf', '-lnetcdf_c++4', '-lnetcdff'
+                ]
+                self.build_system.fflags = [
+                    '-I$EBROOTNETCDF/include',
+                    '-I$EBROOTNETCDFMINCPLUSPLUS/include',
+                    '-I$EBROOTNETCDFMINFORTRAN/include'
+                ]
         else:
             self.build_system.ldflags = ['-%s' % self.linkage]
 

cscs-checks/mch/collectives_halo.py

@@ -108,9 +108,9 @@ def __init__(self, variant):
         super().__init__(variant,
                          {
                              'kesch': {
-                                 'nocomm':  5.7878,
-                                 'nocomp':  5.62155,
-                                 'default': 5.53777
+                                 'nocomm':  6.89819,
+                                 'nocomp':  6.98276,
+                                 'default': 6.85289
                              },
                              'daint': {
                                  'nocomm':  0.0171947,
@@ -130,8 +130,8 @@ def __init__(self, variant):
                          {
                              'kesch': {
                                  'nocomm':  5.7878,
-                                 'nocomp':  5.62155,
-                                 'default': 5.53777
+                                 'nocomp':  54.2012,
+                                 'default': 55.142
                              },
                              'daint': {
                                  'nocomm':  0.978306,