Skip to content
GitLab
Commit 2a24e3b2 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed Kvl.c CMOR_table.c

parent 7399527f
Hide whitespace changes
Inline Side-by-side
src/Kvl.c → src/CMOR_table.c
View file @ 2a24e3b2
......@@ -324,7 +324,7 @@ int conv_cmor_table(const char *filename)
}
void *Kvl(void *argument)
void *CMOR_table(void *argument)
{
cdoInitialize(argument);
......@@ -338,7 +338,6 @@ void *Kvl(void *argument)
if ( cdoVerbose ) cdoPrint("Parse file: %s", filename);
// if ( operatorID == READ_CMOR_TABLE ) read_cmor_table(filename);
if ( operatorID == READ_CMOR_TABLE ) read_cmor_table(filename);
else if ( operatorID == CONV_CMOR_TABLE ) conv_cmor_table(filename);
......
src/Makefile.am
View file @ 2a24e3b2
......@@ -193,6 +193,7 @@ cdo_SOURCES += Adisit.c \
Change_e5slm.c \
Cloudlayer.c \
CMOR.c \
CMOR_table.c \
Collgrid.c \
Command.c \
Comp.c \
......@@ -254,7 +255,6 @@ cdo_SOURCES += Adisit.c \
Invert.c \
Invertlev.c \
Isosurface.c \
Kvl.c \
Log.c \
MapReduce.c \
Maskbox.c \
......
src/Makefile.in
View file @ 2a24e3b2
......@@ -165,8 +165,8 @@ am_cdo_OBJECTS = cdo-cdo.$(OBJEXT) cdo-Adisit.$(OBJEXT) \
cdo-CDIread.$(OBJEXT) cdo-CDIwrite.$(OBJEXT) cdo-Cat.$(OBJEXT) \
cdo-Change.$(OBJEXT) cdo-Change_e5slm.$(OBJEXT) \
cdo-Cloudlayer.$(OBJEXT) cdo-CMOR.$(OBJEXT) \
cdo-Collgrid.$(OBJEXT) cdo-Command.$(OBJEXT) \
cdo-Comp.$(OBJEXT) cdo-Compc.$(OBJEXT) \
cdo-CMOR_table.$(OBJEXT) cdo-Collgrid.$(OBJEXT) \
cdo-Command.$(OBJEXT) cdo-Comp.$(OBJEXT) cdo-Compc.$(OBJEXT) \
cdo-Complextorect.$(OBJEXT) cdo-Cond.$(OBJEXT) \
cdo-Cond2.$(OBJEXT) cdo-Condc.$(OBJEXT) \
cdo-Consecstat.$(OBJEXT) cdo-Copy.$(OBJEXT) \
......@@ -194,7 +194,7 @@ am_cdo_OBJECTS = cdo-cdo.$(OBJEXT) cdo-Adisit.$(OBJEXT) \
cdo-Intntime.$(OBJEXT) cdo-Inttime.$(OBJEXT) \
cdo-Intyear.$(OBJEXT) cdo-Invert.$(OBJEXT) \
cdo-Invertlev.$(OBJEXT) cdo-Isosurface.$(OBJEXT) \
cdo-Kvl.$(OBJEXT) cdo-Log.$(OBJEXT) cdo-MapReduce.$(OBJEXT) \
cdo-Log.$(OBJEXT) cdo-MapReduce.$(OBJEXT) \
cdo-Maskbox.$(OBJEXT) cdo-Mastrfu.$(OBJEXT) cdo-Math.$(OBJEXT) \
cdo-Merge.$(OBJEXT) cdo-Mergegrid.$(OBJEXT) \
cdo-Mergetime.$(OBJEXT) cdo-Merstat.$(OBJEXT) \
......@@ -549,20 +549,20 @@ libcdo_la_SOURCES = cdo_int.h compare.h cdo_pthread.c cdo_vlist.c \
#if ENABLE_MAGICS
cdo_SOURCES = cdo.c Adisit.c Afterburner.c Arith.c Arithc.c \
Arithdays.c Arithlat.c CDItest.c CDIread.c CDIwrite.c Cat.c \
Change.c Change_e5slm.c Cloudlayer.c CMOR.c Collgrid.c \
Command.c Comp.c Compc.c Complextorect.c Cond.c Cond2.c \
Condc.c Consecstat.c Copy.c Deltat.c Deltime.c Derivepar.c \
Detrend.c Diff.c Distgrid.c Duplicate.c EOFs.c Eof3d.c \
EcaIndices.c Echam5ini.c Enlarge.c Enlargegrid.c Ensstat.c \
Ensstat3.c Ensval.c Eofcoeff.c Eofcoeff3d.c Exprf.c FC.c \
Filedes.c Fillmiss.c Filter.c Fldrms.c Fldstat.c Fldstat2.c \
Fourier.c Gengrid.c Gradsdes.c Gridboxstat.c Gridcell.c \
Gridsearch.c Harmonic.c Hi.c Histogram.c Importamsr.c \
Importbinary.c Importcmsaf.c Importobs.c Info.c Input.c \
Intgrid.c Intgridtraj.c Intlevel.c Intlevel3d.c Intntime.c \
Inttime.c Intyear.c Invert.c Invertlev.c Isosurface.c Kvl.c \
Log.c MapReduce.c Maskbox.c Mastrfu.c Math.c Merge.c \
Mergegrid.c Mergetime.c Merstat.c Monarith.c Mrotuv.c \
Change.c Change_e5slm.c Cloudlayer.c CMOR.c CMOR_table.c \
Collgrid.c Command.c Comp.c Compc.c Complextorect.c Cond.c \
Cond2.c Condc.c Consecstat.c Copy.c Deltat.c Deltime.c \
Derivepar.c Detrend.c Diff.c Distgrid.c Duplicate.c EOFs.c \
Eof3d.c EcaIndices.c Echam5ini.c Enlarge.c Enlargegrid.c \
Ensstat.c Ensstat3.c Ensval.c Eofcoeff.c Eofcoeff3d.c Exprf.c \
FC.c Filedes.c Fillmiss.c Filter.c Fldrms.c Fldstat.c \
Fldstat2.c Fourier.c Gengrid.c Gradsdes.c Gridboxstat.c \
Gridcell.c Gridsearch.c Harmonic.c Hi.c Histogram.c \
Importamsr.c Importbinary.c Importcmsaf.c Importobs.c Info.c \
Input.c Intgrid.c Intgridtraj.c Intlevel.c Intlevel3d.c \
Intntime.c Inttime.c Intyear.c Invert.c Invertlev.c \
Isosurface.c Log.c MapReduce.c Maskbox.c Mastrfu.c Math.c \
Merge.c Mergegrid.c Mergetime.c Merstat.c Monarith.c Mrotuv.c \
Mrotuvb.c Ninfo.c Nmltest.c Output.c Outputgmt.c Pack.c \
Pardup.c Pinfo.c Pressure.c Regres.c Remap.c Remapeta.c \
Replace.c Replacevalues.c Rhopot.c Rotuv.c Runpctl.c Runstat.c \
......@@ -801,6 +801,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-CDItest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-CDIwrite.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-CMOR.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-CMOR_table.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Cat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-CdoMagicsMapper.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Change.Po@am__quote@
......@@ -867,7 +868,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Invert.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Invertlev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Isosurface.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Kvl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Log.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Maggraph.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdo-Magplot.Po@am__quote@
......@@ -1998,6 +1998,20 @@ cdo-CMOR.obj: CMOR.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdo-CMOR.obj `if test -f 'CMOR.c'; then $(CYGPATH_W) 'CMOR.c'; else $(CYGPATH_W) '$(srcdir)/CMOR.c'; fi`
cdo-CMOR_table.o: CMOR_table.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdo-CMOR_table.o -MD -MP -MF $(DEPDIR)/cdo-CMOR_table.Tpo -c -o cdo-CMOR_table.o `test -f 'CMOR_table.c' || echo '$(srcdir)/'`CMOR_table.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-CMOR_table.Tpo $(DEPDIR)/cdo-CMOR_table.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='CMOR_table.c' object='cdo-CMOR_table.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdo-CMOR_table.o `test -f 'CMOR_table.c' || echo '$(srcdir)/'`CMOR_table.c
cdo-CMOR_table.obj: CMOR_table.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdo-CMOR_table.obj -MD -MP -MF $(DEPDIR)/cdo-CMOR_table.Tpo -c -o cdo-CMOR_table.obj `if test -f 'CMOR_table.c'; then $(CYGPATH_W) 'CMOR_table.c'; else $(CYGPATH_W) '$(srcdir)/CMOR_table.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-CMOR_table.Tpo $(DEPDIR)/cdo-CMOR_table.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='CMOR_table.c' object='cdo-CMOR_table.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdo-CMOR_table.obj `if test -f 'CMOR_table.c'; then $(CYGPATH_W) 'CMOR_table.c'; else $(CYGPATH_W) '$(srcdir)/CMOR_table.c'; fi`
cdo-Collgrid.o: Collgrid.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdo-Collgrid.o -MD -MP -MF $(DEPDIR)/cdo-Collgrid.Tpo -c -o cdo-Collgrid.o `test -f 'Collgrid.c' || echo '$(srcdir)/'`Collgrid.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-Collgrid.Tpo $(DEPDIR)/cdo-Collgrid.Po
......@@ -2852,20 +2866,6 @@ cdo-Isosurface.obj: Isosurface.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdo-Isosurface.obj `if test -f 'Isosurface.c'; then $(CYGPATH_W) 'Isosurface.c'; else $(CYGPATH_W) '$(srcdir)/Isosurface.c'; fi`
cdo-Kvl.o: Kvl.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdo-Kvl.o -MD -MP -MF $(DEPDIR)/cdo-Kvl.Tpo -c -o cdo-Kvl.o `test -f 'Kvl.c' || echo '$(srcdir)/'`Kvl.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-Kvl.Tpo $(DEPDIR)/cdo-Kvl.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='Kvl.c' object='cdo-Kvl.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdo-Kvl.o `test -f 'Kvl.c' || echo '$(srcdir)/'`Kvl.c
cdo-Kvl.obj: Kvl.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdo-Kvl.obj -MD -MP -MF $(DEPDIR)/cdo-Kvl.Tpo -c -o cdo-Kvl.obj `if test -f 'Kvl.c'; then $(CYGPATH_W) 'Kvl.c'; else $(CYGPATH_W) '$(srcdir)/Kvl.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-Kvl.Tpo $(DEPDIR)/cdo-Kvl.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='Kvl.c' object='cdo-Kvl.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdo-Kvl.obj `if test -f 'Kvl.c'; then $(CYGPATH_W) 'Kvl.c'; else $(CYGPATH_W) '$(srcdir)/Kvl.c'; fi`
cdo-Log.o: Log.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cdo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdo-Log.o -MD -MP -MF $(DEPDIR)/cdo-Log.Tpo -c -o cdo-Log.o `test -f 'Log.c' || echo '$(srcdir)/'`Log.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cdo-Log.Tpo $(DEPDIR)/cdo-Log.Po
......
src/modules.c
View file @ 2a24e3b2
......@@ -54,6 +54,7 @@ void *Change(void *argument);
void *Change_e5slm(void *argument);
void *Cloudlayer(void *argument);
void *CMOR(void *argument);
void *CMOR_table(void *argument);
void *Collgrid(void *argument);
void *Command(void *argument);
void *Comp(void *argument);
......@@ -113,7 +114,6 @@ void *Intyear(void *argument);
void *Invert(void *argument);
void *Invertlev(void *argument);
void *Isosurface(void *argument);
void *Kvl(void *argument);
void *Log(void *argument);
void *MapReduce(void *argument);
void *Maskbox(void *argument);
......@@ -291,6 +291,7 @@ void *Maggraph(void *argument);
#define Change_e5slmOperators {"change_e5slm", "change_e5lsm", "change_e5mask"}
#define CloudlayerOperators {"cloudlayer"}
#define CMOROperators {"cmor"}
#define CMORtableOperators {"read_cmor_table", "conv_cmor_table"}
#define CollgridOperators {"collgrid"}
#define CommandOperators {"command", "com", "cmd"}
#define CompOperators {"eq", "ne", "le", "lt", "ge", "gt"}
......@@ -353,7 +354,6 @@ void *Maggraph(void *argument);
#define InvertOperators {"invertlat", "invertlon", "invertlatdes", "invertlondes", "invertlatdata", "invertlondata"}
#define InvertlevOperators {"invertlev"}
#define IsosurfaceOperators {"isosurface"}
#define KvlOperators {"read_cmor_table", "conv_cmor_table"}
#define LogOperators {"dumplogs", "daylogs", "monlogs", "dumplogo", "snamelogo", "scalllogo", "smemlogo", "stimelogo", "sperclogo"}
#define MapReduceOperators {"reducegrid"}
#define MaskboxOperators {"masklonlatbox", "maskindexbox"}
......@@ -579,6 +579,7 @@ static modules_t Modules[] =
{ Change_e5slm, NULL, Change_e5slmOperators, 0, CDI_REAL, 1, 1 },
{ Cloudlayer, NULL, CloudlayerOperators, 1, CDI_REAL, 1, 1 },
{ CMOR, CMORHelp, CMOROperators, 1, CDI_REAL, 1, 0 },
{ CMOR_table, NULL, CMORtableOperators, 1, CDI_REAL, 0, 0 },
{ Collgrid, CollgridHelp, CollgridOperators, 1, CDI_REAL, -1, 1 },
{ Command, NULL, CommandOperators, 0, CDI_REAL, 1, 0 },
{ Comp, CompHelp, CompOperators, 1, CDI_REAL, 2, 1 },
......@@ -639,7 +640,6 @@ static modules_t Modules[] =
{ Invert, InvertHelp, InvertOperators, 1, CDI_REAL, 1, 1 },
{ Invertlev, InvertlevHelp, InvertlevOperators, 1, CDI_REAL, 1, 1 },
{ Isosurface, NULL, IsosurfaceOperators, 1, CDI_REAL, 1, 1 },
{ Kvl, NULL, KvlOperators, 1, CDI_REAL, 0, 0 },
{ Log, NULL, LogOperators, 0, CDI_REAL, 1, 0 },
{ MapReduce, MapReduceHelp, MapReduceOperators, 1, CDI_REAL, 1, 1 },
{ Maskbox, MaskboxHelp, MaskboxOperators, 1, CDI_REAL, 1, 1 },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Imprint | Privacy Policy