diff --git a/.gitattributes b/.gitattributes index 14b8135b1096ffed99790ab41b5888cf02ab8d47..57c7ddb07be9756a6bd72739c2336ac047c89f08 100644 --- a/.gitattributes +++ b/.gitattributes @@ -113,7 +113,7 @@ src/griblib.c -text src/grid.c -text src/grid.h -text src/grid_gme.c -text -src/grid_lambert.c -text +src/grid_lcc.c -text src/grid_rot.c -text src/ieg.h -text src/ieglib.c -text diff --git a/config/default b/config/default index ccee066876fba2b0a66b5a742f9cb28da3b3f3e7..273a260469882b02506362ec13f94bb849d631db 100755 --- a/config/default +++ b/config/default @@ -43,7 +43,7 @@ case "${HOSTNAME}" in ./configure --prefix=$HOME/local/SUN64 \ --with-netcdf=/scratch/small/m214/m214089/local/SunOS64 \ --with-szlib=$HOME/local/solaris10 \ - CC=cc CFLAGS="-g -mt -fast -xtarget=native -m64" + CC=cc CFLAGS="-g -mt -xO3 -xtarget=native -m64" ;; # sx6-nec-superux12.2 cs*) diff --git a/src/Makefile.am b/src/Makefile.am index cfa0773fe05ad82d34332ad686c186860aec7d16..67c5c6bc1ff12a3be92cd9b791deba7597754b03 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ libcdi_a_SOURCES = \ grid.c \ grid_rot.c \ grid_gme.c \ - grid_lambert.c \ + grid_lcc.c \ zaxis.c \ stream.c \ stream_var.c \ diff --git a/src/Makefile.in b/src/Makefile.in index d89b6d9149c4b9bd780932bc2205ede77837213e..140ee114f893fec635e5674906ae73098b937465 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -66,7 +66,7 @@ am_libcdi_a_OBJECTS = cdiFortran.$(OBJEXT) cdi_error.$(OBJEXT) \ stream_history.$(OBJEXT) stream_grb.$(OBJEXT) \ stream_cdf.$(OBJEXT) stream_srv.$(OBJEXT) stream_ext.$(OBJEXT) \ stream_ieg.$(OBJEXT) grid.$(OBJEXT) grid_rot.$(OBJEXT) \ - grid_gme.$(OBJEXT) grid_lambert.$(OBJEXT) zaxis.$(OBJEXT) \ + grid_gme.$(OBJEXT) grid_lcc.$(OBJEXT) zaxis.$(OBJEXT) \ stream.$(OBJEXT) stream_var.$(OBJEXT) stream_record.$(OBJEXT) \ tsteps.$(OBJEXT) stream_int.$(OBJEXT) servicelib.$(OBJEXT) \ extralib.$(OBJEXT) ieglib.$(OBJEXT) cdf.$(OBJEXT) \ @@ -224,7 +224,7 @@ libcdi_a_SOURCES = \ grid.c \ grid_rot.c \ grid_gme.c \ - grid_lambert.c \ + grid_lcc.c \ zaxis.c \ stream.c \ stream_var.c \ @@ -380,7 +380,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/griblib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_gme.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_lambert.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_lcc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid_rot.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ieglib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/institution.Po@am__quote@ diff --git a/src/grid_lambert.c b/src/grid_lcc.c similarity index 100% rename from src/grid_lambert.c rename to src/grid_lcc.c diff --git a/src/make_cdilib b/src/make_cdilib index 829446a817c504653373fd59a1cd76ac0d0d69fe..8517948c69159856aa34a3011b2282b00b83e48b 100755 --- a/src/make_cdilib +++ b/src/make_cdilib @@ -72,7 +72,7 @@ c="dmemory.c \ ieglib.c \ grid_rot.c \ grid_gme.c \ - grid_lambert.c \ + grid_lcc.c \ grid.c \ zaxis.c \ cdf_int.c \ diff --git a/src/stream_cdf.c b/src/stream_cdf.c index a4ea9bbb03314e6f561a1fc75c5ce3955bce5474..c7836bdcbd46b1c790d7a5657ea30923a2336591 100644 --- a/src/stream_cdf.c +++ b/src/stream_cdf.c @@ -2151,6 +2151,12 @@ void cdfDefGrid(int streamID, int gridID) { cdfDefCell(streamID, gridID); } + /* + else if ( gridtype == GRID_LCC ) + { + cdfDefLcc(streamID, gridID); + } + */ else { Error(func, "%s grid unsupported!", gridNamePtr(gridtype));