Added Remap_gme.py.test.in

configure.ac

@@ -243,6 +243,7 @@ AC_CONFIG_FILES([test/pytest/cdoTest.py
                 test/pytest/Remap3.py.test
                 test/pytest/Remap4.py.test
                 test/pytest/Remap_global_5_grid.py.test
+                test/pytest/Remap_gme.py.test
                 test/pytest/Remap_healpix.py.test
                 test/pytest/Remap_small.py.test
                 test/pytest/Remap_extra.py.test

test/data/Makefile.am

@@ -4,7 +4,7 @@ INPUTDATA = ts_1d_5years ts_ym_5years ts_mm_5years ts_mm_1year ts_mm_1991 ts_6h_
             grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc netcdf_testfile03.nc testfile01c.nc \
             datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb tsurf_spain.grb spain.grid \
             topo_eu5.grb vars_data.grb math_data tsurf_1d_1year tsurf_runpctl_1d_1year mpiom_tho_sao.srv topo5.srv \
-            temp_hp32_nest.nc temp_hp16_nest.nc temp_global_2.nc tsurf_5steps.nc tsurf_5steps_land.nc
+            temp_gme32.grb temp_gme16.grb temp_hp32_nest.nc temp_hp16_nest.nc temp_global_2.nc temp_global_2.grb tsurf_5steps.nc tsurf_5steps_land.nc
 
 FILE         = file_F32_srv_ref
 GRIB         = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref grib_testfile03_sinfo_ref grib_testfile03_info_ref
@@ -55,6 +55,7 @@ SPECTRAL     = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref
 WIND         = dv2ps_ref dv2uv_ref dv2uvl_ref uv2dv_ref uv2dvl_ref
 INTTIME      = inttime_ref intyear1992_ref
 VERTINT      = intlevel_ref intlevel_1_ref intlevel_2_ref intlevel3d_1_ref intlevel3d_2_ref ml2pl_ref ml2plx_ref ap2pl_ref ap2pl_l90_ref gh2hl_ref gh2hlx_ref vert3D_c1.srv vert3D_c2.srv
+REMAPGME     = temp_remapcon_gme32_to_global_5_ref temp_remapcon_global_2_to_gme16_ref temp_remapcon_gme16_to_gme16_ref
 REMAPHEALPIX = temp_remapcon_global_2_to_hp16_nest_ref temp_remapcon_hp16_nest_to_hp16_nest_ref temp_remapcon_hp32_nest_to_global_5_ref \
                temp_remapdis_global_2_to_hp16_nest_ref temp_remapdis_hp16_nest_to_hp16_nest_ref temp_remapdis_hp32_nest_to_global_5_ref \
                temp_remapnn_global_2_to_hp16_nest_ref temp_remapnn_hp16_nest_to_hp16_nest_ref temp_remapnn_hp32_nest_to_global_5_ref
@@ -193,7 +194,7 @@ EXTRA_DIST = $(INPUTDATA) $(FILE) $(GRIB) $(NETCDF) $(ADISIT) $(EOF) $(COND) $(C
              $(MASKREGION) $(MASKLONLATBOX) $(MASKINDEXBOX) $(SELREGION) $(SELLONLATBOX) $(SELINDEXBOX) \
              $(TIMSTAT) $(YEARSTAT) $(MONSTAT) $(DAYSTAT) $(TIMSTATM) $(YEARSTATM) $(MONSTATM) $(DAYSTATM) \
              $(MERSTAT) $(ZONSTAT) $(ENSSTAT) $(ENSSTATM) $(ENSPCTL) $(SPECTRAL) $(WIND) $(INTTIME) $(VERTINT) \
-             $(REMAPHEALPIX) $(REMAPGRID) $(REMAPSTAT) $(REMAP) $(REMAP2) $(REMAP3) $(REMAP4) $(SELECT) $(DETREND) \
+             $(REMAPGME) $(REMAPHEALPIX) $(REMAPGRID) $(REMAPSTAT) $(REMAP) $(REMAP2) $(REMAP3) $(REMAP4) $(SELECT) $(DETREND) \
              $(THREAD) $(EXPR) $(GRADSDES) $(ARITH) $(DAYARITH) $(MONARITH) $(YEARARITH) $(YDAYARITH) $(YMONARITH) \
              $(MAPREDUCE) $(MERGETIME) $(REMAPETA) $(SMOOTH) $(SETMISS) $(FILTER) $(PERCENTILE) $(TIMFILLMISS) $(VERTFILLMISS) \
              $(PACK) $(SPLIT) $(CONSECSTAT)

test/pytest/Makefile.am

@@ -74,6 +74,7 @@ TESTS =\
 		Remap3.py.test\
 		Remap4.py.test\
 		Remap_global_5_grid.py.test\
+		Remap_gme.py.test\
 		Remap_healpix.py.test\
 		Remap_small.py.test\
 		Remap_extra.py.test\

test/pytest/Remap_gme.py.test.in

+#! @PYTHON@
+
+from cdoTest import *
+
+FORMAT="-f srv -b 32"
+OPERATORS=["remapcon"]
+ABSLIM=0.001
+
+test_module=TestModule()
+
+SRCGRIDS=["gme32", "global_2", "gme16"]
+TGTGRIDS=["global_5", "gme16", "gme16"]
+for SRCGRID,TGTGRID in zip(SRCGRIDS,TGTGRIDS):
+    for OPERATOR in OPERATORS:
+        OFILE=f'temp_{OPERATOR}_{SRCGRID}_to_{TGTGRID}_res'
+        RFILE=f'{DATAPATH}/temp_{OPERATOR}_{SRCGRID}_to_{TGTGRID}_ref'
+
+        t=TAPTest(f'{OPERATOR}  {SRCGRID} to {TGTGRID}')
+        t.add(f'{CDO}  {FORMAT} {OPERATOR},{TGTGRID} {DATAPATH}/temp_{SRCGRID}.grb {OFILE}')
+        t.add(f'{CDO} diff,abslim={ABSLIM} {OFILE} {RFILE}')
+        t.clean(OFILE)
+        test_module.add(t)
+
+test_module.run()

test/pytest/Remap_healpix.py.test.in

@@ -5,7 +5,7 @@ from cdoTest import *
 HAS_NETCDF=cdo_check_req("has-nc")
 
 FORMAT="-f srv -b 32"
-OPERATORS=["remapnn", "remapdis", "remapnn", "remapcon"]
+OPERATORS=["remapnn", "remapdis", "remapcon"]
 ABSLIM=0.001
 
 test_module=TestModule()