diff --git a/mk/Make.defs.femto b/mk/Make.defs.femto index bf0e3dca2..8f80712be 100644 --- a/mk/Make.defs.femto +++ b/mk/Make.defs.femto @@ -78,8 +78,8 @@ include ../mk/include_modules # Don't comment out the follow ifdef ifdef USE_GOTM - GTMMOD = -I/sciclone/home10/yinglong/SCHISM/svn/trunk/src/GOTM3.2.5/modules/IFORT/ #modules - GTMLIBS = -L/sciclone/home10/yinglong/SCHISM/svn/trunk/src/GOTM3.2.5/lib/IFORT/ -lturbulence_prod -lutil_prod + GTMMOD = -I/sciclone/home/yinglong/GOTM3.2.5_libs/Femto/modules/IFORT/ #modules + GTMLIBS = -L/sciclone/home/yinglong/GOTM3.2.5_libs/Femto/lib/IFORT/ -lturbulence_prod -lutil_prod else GTMMOD = GTMLIBS = diff --git a/mk/include_modules b/mk/include_modules index 26c8712f3..e7e0cb2d7 100644 --- a/mk/include_modules +++ b/mk/include_modules @@ -43,8 +43,8 @@ EXEC := $(EXEC)_$(TVD_LIM) # GOTM turbulence closure model -# USE_GOTM = yes -# EXEC := $(EXEC)_GOTM + USE_GOTM = yes + EXEC := $(EXEC)_GOTM # Wind wave model WWM # USE_WWM = yes diff --git a/src/GOTM3.2.5/README b/src/GOTM3.2.5/README index 98de81d20..c4ee23186 100644 --- a/src/GOTM3.2.5/README +++ b/src/GOTM3.2.5/README @@ -2,10 +2,10 @@ To build GOTM lib: On tcsh: setenv NETCDFHOME /usr/local/intel64/nehalem/intel-2016/netcdf-4.3.2/ (so that NETCDFLIBNAME below points to right netcdf lib) -setenv NETCDFINC /sciclone/home10/yinglong/SCHISM/svn/trunk/src/GOTM3.2.5/netcdf_include (WARNING: use +setenv NETCDFINC /sciclone/home/yinglong/git/schism/src/GOTM3.2.5/netcdf_include (WARNING: use files in this dir, not in the netcdf include dir!!!!) setenv NETCDFLIBNAME $NETCDFHOME/lib/libnetcdf.a -setenv GOTMDIR /sciclone/home10/yinglong/SCHISM/svn/trunk/src/GOTM3.2.5/ +setenv GOTMDIR /sciclone/home/yinglong/git/schism/src/GOTM3.2.5/ setenv FORTRAN_COMPILER IFORT (Note: see $GOTMDIR/compilers/ for names "IFORT" etc) On bash: export NETCDFHOME=/usr/local/ etc. diff --git a/src/GOTM3.2.5/src/gotm_prod_IFORT b/src/GOTM3.2.5/src/gotm_prod_IFORT index 13bd3eccb..45d5f22c7 100755 Binary files a/src/GOTM3.2.5/src/gotm_prod_IFORT and b/src/GOTM3.2.5/src/gotm_prod_IFORT differ