v4.4.5

Author: SiqiLiOcean

README.md

@@ -1,4 +1,4 @@
-# FVCOM 4.4.4
+# FVCOM 4.4.5
 
 http://fvcom.smast.umassd.edu/
 

src/fvcom.F

@@ -27,7 +27,7 @@
 !/===========================================================================/
 
 !==============================================================================!
-!  VERSION 4.4.4
+!  VERSION 4.4.5
 !==============================================================================!
 
 PROGRAM FVCOM

src/make.inc

@@ -173,7 +173,16 @@ dashL= $(empty) -L
 #--------------------------------------------------------------------------
 
              FLAG_4 = -DMULTIPROCESSOR
-             PARLIB = -lmetis  #-L/usr/local/lib -lmetis
+#         If using METIS 5 or above, uncomment FLAG_411 and read the file readme_metis in folder METIS_readme for detail
+	     FLAG_411 = -DMETIS_5
+#        If FLAG_411 is defined, uncomment path below	     
+             PARLIB = 
+             PARTINCS = -I/usr/local/install/metis/5.1.0/intel/19/include
+             PARTLIBS = -L/usr/local/install/metis/5.1.0/intel/19/lib -lmetis
+#        If FLAG_411 is not defined, uncomment path below
+#             PARLIB = -lmetis  #-L/usr/local/lib -lmetis
+#             PARTINCS =
+#             PARTLIBS =
 
 #--------------------------------------------------------------------------
 #        WATER_QUALITY      INCLUDE EPA WATER QUALITY MOD
@@ -486,7 +495,8 @@ dashL= $(empty) -L
 #           FLAG_40 =  -DLIMITER_VER_ADV
 #--------------------------------------------------------------------------
 #        SPECIAL PARTITION
-#        This flag can make sure the identical repeat run for same amount of CPUs 
+#        This flag can make sure the identical repeat run for same amount of CPUs
+#        (there should be no opt = -O3 when compilation)
 #--------------------------------------------------------------------------
 #             FLAG_42 = -DPARTITION_SPECIAL
 
@@ -645,18 +655,18 @@ dashL= $(empty) -L
    $(FLAG_31) $(FLAG_32) $(FLAG_33) $(FLAG_34) \
    $(FLAG_35) $(FLAG_36) $(FLAG_37) $(FLAG_38) \
    $(FLAG_39) $(FLAG_40) $(FLAG_41) $(FLAG_42) \
-   $(FLAG_43) $(FLAG_44) $(FLAG_80)$(FLAG_LAM)\
+   $(FLAG_43) $(FLAG_44) $(FLAG_80) $(FLAG_LAM) $(FLAG_411)\
    $(FLAG_101) $(FLAG_102) $(FLAG_103) $(FLAG_104) $(FLAG_105)\
    $(FLAG_211) $(FLAG_212) $(FLAG_213) $(FLAG_251) $(FLAG_261) $(FLAG_262)\
    $(FLAG_USE_NETCDF4) $(FLAG_USE_COMPRESSION)
 #--------------------------------------------------------------------------
 #  Libraries           
 #--------------------------------------------------------------------------
 
-            LIBS  =	$(LIBDIR) $(CLIB)  $(PARLIB) $(IOLIBS)	$(DTLIBS)\
+            LIBS  =	$(LIBDIR) $(CLIB) $(PARLIB) $(PARTLIBS) $(IOLIBS)	$(DTLIBS)\
 			$(MPILIB) $(GOTMLIB) $(KFLIB) $(BIOLIB)	\
 			$(OILIB) $(VISITLIB) $(PROJLIBS) $(PETSC_LIB)
 
             INCS  = 	$(INCDIR) $(IOINCS) $(GOTMINCS) $(BIOINCS)\
-			 $(VISITINCPATH) $(PROJINCS) $(DTINCS) \
+			 $(VISITINCPATH) $(PROJINCS) $(DTINCS) $(PARTINCS)\
 			 $(PETSC_FC_INCLUDES)

src/makedepends

@@ -8,8 +8,8 @@ mod_utils.o : mod_utils.F swmod1.o mod_main.o mod_main.o mod_main.o mod_prec.o m
 mod_clock.o : mod_clock.F mod_utils.o mod_main.o mod_time.o mod_prec.o mod_prec.o 
 eqs_of_state.o : eqs_of_state.F mod_prec.o mod_utils.o mod_main.o mod_prec.o 
 mod_interp.o : mod_interp.F mod_main.o mod_spherical.o mod_clock.o mod_prec.o mod_utils.o mod_prec.o 
-mod_par.o : mod_par.F mod_main.o mod_time.o mod_main.o mod_utils.o mod_types.o mod_prec.o 
-mod_par_special.o : mod_par_special.F mod_main.o mod_time.o mod_main.o mod_utils.o mod_types.o mod_prec.o 
+mod_par.o : mod_par.F mod_main.o mod_time.o mod_main.o mod_utils.o mod_types.o partition.o mod_prec.o 
+mod_par_special.o : mod_par_special.F mod_main.o mod_time.o mod_main.o mod_utils.o mod_types.o partition.o mod_prec.o 
 mod_ncll.o : mod_ncll.F mod_main.o mod_interp.o mod_utils.o mod_time.o mod_prec.o 
 mod_nctools.o : mod_nctools.F mod_main.o mod_par_special.o mod_main.o mod_ncll.o mod_prec.o 
 mod_wd.o : mod_wd.F mod_par_special.o mod_main.o mod_prec.o mod_prec.o 

src/makefile

@@ -113,7 +113,7 @@ MAIN_W = ocpmix.F	ocpcre.F	ocpids.F	\
 	swancom1.F	swancom2.F	swancom3.F	swancom4.F	\
 	swancom5.F	w3part.F
 
-COBJS = func_pointer.c
+COBJS = func_pointer.c	partition.c
 
 
 BIOGEN	= mod_bio_3D.F	mod_onedtide.F
@@ -181,7 +181,7 @@ clean:
 
 clobber:	
 		make clean
-		/bin/rm -f fvcom libfvcom.so libfvcom.a
+		/bin/rm -f fvcom libfvcom.so libfvcom.a postFVCOM_ncnest_reorder
 
 allclean:
 		make clean