Fix NCL foss 2020b

foss-2020b/ELIC_Python-1-foss-2020b-Python-3.8.6.eb

@@ -18,7 +18,7 @@ dependencies = [
     ('SciPy-bundle', '2020.11'),
     ('matplotlib', '3.3.3', versionsuffix),
     ('GDAL', '3.2.0', versionsuffix),
-    #('NCL', '6.6.2'),
+    ('NCL', '6.6.2'),
     ('CDO', '1.9.9'),
     ('NCO', '4.9.5'),
     ('ncview', '2.1.7'),
@@ -44,22 +44,22 @@ exts_list = [
         'source_urls': ['https://sourceforge.net/projects/%(name)s/files/%(name)s/%(version)s'],
         'use_pip': True,
     }),
-    ('stratify', '0.1.1', {
-        'modulename': 'stratify',
-        'source_tmpl': 'v%(version)s.tar.gz',
-        'source_urls': ['https://github.com/SciTools-incubator/python-stratify/archive/'],
-    }),
+    #('stratify', '0.1.1', {
+    #    'modulename': 'stratify',
+    #    'source_tmpl': 'v%(version)s.tar.gz',
+    #    'source_urls': ['https://github.com/SciTools-incubator/python-stratify/archive/'],
+    #}),
     #('mo_pack', '0.2.0', {
     #    'source_tmpl': 'v%(version)s.tar.gz',
     #    'source_urls': ['https://github.com/SciTools/mo_pack/archive/'],
     #    'checksums': ['4aa70e1f846b666670843bc2514435dedf7393203e88abaf74d48f8f2717a726'],
     #}),
-    #('basemap', '1.2.1rel', {
-    #    'modulename': 'mpl_toolkits',
-    #    'source_tmpl': 'v%(version)s.tar.gz',
-    #    'source_urls': ['https://github.com/matplotlib/basemap/archive'],
-    #    'use_pip': True,
-    #}),
+    ('basemap', '1.2.1rel', {
+        'modulename': 'mpl_toolkits',
+        'source_tmpl': 'v%(version)s.tar.gz',
+        'source_urls': ['https://github.com/matplotlib/basemap/archive'],
+        'use_pip': True,
+    }),
 ]
 
 modextrapaths = {
@@ -70,7 +70,7 @@ modextrapaths = {
 postinstallcmds = [
     "cd %(installdir)s && " +
     'pip install setuptools --upgrade && ' +
-    'pip install olefile pyproj pyshp chardet urllib3 --install-option "--prefix=%(installdir)s" && ' +
+    'pip install olefile pyproj pyshp chardet urllib3 --prefix="%(installdir)s" && ' +
     'pip install OWSLib ' +
                 'netCDF4 ' +
                 'dask ' +
@@ -127,7 +127,7 @@ postinstallcmds = [
                 #'jsonschema ' +
                 #'plotly-charts ' +
                 #'rpy2 ' +
-                '--install-option "--prefix=%(installdir)s" '
+                '--prefix="%(installdir)s" '
 ]
 
 moduleclass = 'numlib'

foss-2020b/NCL-6.6.2-foss-2020b.eb

@@ -9,7 +9,10 @@ toolchainopts = {'cstd': 'c99', 'openmp': True, 'pic': True}
 
 source_urls = ['https://github.com/NCAR/ncl/archive/']
 sources = ['%(version)s.tar.gz']
-patches = ['NCL-6.4.0_fix-types.patch']
+patches = [
+    'NCL-6.4.0_fix-types.patch',
+    'NCL-6.6.2_fix-GCC-10.patch',
+]
 checksums = [
     'cad4ee47fbb744269146e64298f9efa206bc03e7b86671e9729d8986bb4bc30e',  # 6.6.2.tar.gz
     'f6dfaf95e5de9045745e122cb44f9c035f81fab92f5892991ddfe93945891c8f',  # NCL-6.4.0_fix-types.patch

foss-2020b/NCL-6.6.2_fix-GCC-10.patch

@@ -0,0 +1,54 @@
+--- ncl-6.6.2/ncarg2d/src/libncarg_gks/bwi/argb2ci.f.orig	2019-02-28 00:44:39.000000000 +0100
++++ ncl-6.6.2/ncarg2d/src/libncarg_gks/bwi/argb2ci.f	2020-11-13 16:00:28.210743708 +0100
+@@ -16,10 +16,10 @@
+       integer index, nearest
+       integer i
+       integer ARGBMASK, RMASK, GMASK, BMASK
+-      parameter (ARGBMASK = Z'40000000')
+-      parameter (RMASK     = Z'00FF0000')
+-      parameter (GMASK     = Z'0000FF00')
+-      parameter (BMASK     = Z'000000FF')
++      parameter (ARGBMASK = int(Z'40000000'))
++      parameter (RMASK     = int(Z'00FF0000'))
++      parameter (GMASK     = int(Z'0000FF00'))
++      parameter (BMASK     = int(Z'000000FF'))
+       real r, g, b, dist, mindist
+ 
+       if (iand(index, ARGBMASK).eq.0) then
+@@ -31,8 +31,8 @@
+       mindist = 2e31
+       nearest = 0
+       do i=1,mol
+-          r = (iand(index, RMASK) / Z'0000FFFF') / 255.
+-          g = (iand(index, GMASK) / Z'000000FF') / 255.
++          r = (iand(index, RMASK) / int(Z'0000FFFF')) / 255.
++          g = (iand(index, GMASK) / int(Z'000000FF')) / 255.
+           b = (iand(index, BMASK))               / 255.
+ 
+ C         we don't need absolute distance, so forego the sqrt operation...
+--- ncl-6.6.2/ni/src/ncl/NclApi.c	2019-02-28 00:44:39.000000000 +0100
++++ NclApi.c	2020-11-16 11:36:39.493087113 +0100
+@@ -140,9 +140,9 @@
+ extern char *the_input_buffer_ptr;
+ extern int the_input_buffer_size;
+ 
+-FILE *thefptr;
+-FILE *theoptr;
+-int cmd_line;
++extern FILE *thefptr;
++extern FILE *theoptr;
++extern int cmd_line;
+ extern int cur_line_number;
+ extern char *cur_line_text;
+ extern int cur_line_maxsize;
+--- ncl-6.6.2/ni/src/ncl/NclNewHDF5.c	2019-02-28 00:44:39.000000000 +0100
++++ NclNewHDF5.c	2020-11-16 11:38:28.137952623 +0100
+@@ -82,7 +82,7 @@
+ 
+ #define NUMPOSDIMNAMES	6
+ 
+-NclQuark possibleDimNames[NUMPOSDIMNAMES];
++extern NclQuark possibleDimNames[NUMPOSDIMNAMES];
+ 
+ #ifndef FALSE
+ #define FALSE           0

intel-2020b/iccifort-2020.4.304.eb

@@ -35,7 +35,6 @@ components = [
 
 dontcreateinstalldir = True
 
-license_file = '/opt/easybuild/configs/utils/license_intel_tmp.lic'
-#license_file = '/opt/easybuild/configs/utils/license_intel_all.lic'
+license_file = '/opt/easybuild/configs/utils/license_intel_all.lic'
 
 moduleclass = 'compiler'