new aquabc_II

jalessandri · Feb 26, 2015 · 0c0c25b · 0c0c25b
1 parent e07d286
commit 0c0c25b
Show file tree

Hide file tree

Showing 27 changed files with 21,838 additions and 12,184 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,58 @@
 ============================================================
 
+Thu Feb 26 18:40:05 CET 2015
+
+new aquabc_II
+
+ LOG                                  |    5 +
+ RELEASE_NOTES                        |    5 +
+ fem3d/Makefile                       |   33 +-
+ fem3d/alukas.f                       | 4807 --------------------------------
+ fem3d/aquabc.f                       |  685 -----
+ fem3d/aquabc.h                       |   17 -
+ fem3d/aquabc_II.f90                  | 1579 +++++++++++
+ fem3d/aquabc_II.h                    |   21 +
+ fem3d/aquabc_II_aout.h               |   49 +
+ fem3d/aquabc_II_apara.f              |  980 +++++++
+ fem3d/aquabc_II_ased_ini.f90         |  292 ++
+ fem3d/aquabc_II_co2sys.f90           | 4875 ++++++++++++++++++++++++++++++++
+ fem3d/aquabc_II_fem_interface.f      | 4165 +++++++++++++++++++++++++++
+ fem3d/aquabc_II_pelagic_lib.f90      | 1756 ++++++++++++
+ fem3d/aquabc_II_pelagic_model.f90    | 5098 +++++++++++++++++++++++++++++++++
+ fem3d/aquabc_II_sediment_lib.f90     |   95 +
+ fem3d/aquabc_II_sediment_model_1.f90 | 2511 +++++++++++++++++
+ fem3d/aquabc_II_util.f               |  367 +++
+ fem3d/aquabc_aout.h                  |   49 -
+ fem3d/aquabc_fem_interface.f         | 5105 ----------------------------------
+ fem3d/aquabc_sediment_model_1.f      | 1433 ----------
+ fem3d/aquabc_util.f                  |  127 -
+ fem3d/subwaves.f                     |    1 +
+ fembin/mkdp.pl                       |    4 +
+ femdoc/final/shyfem.pdf              |  Bin 293719 -> 293719 bytes
+ femdoc/final/shyfem.ps               |    4 +-
+ 26 files changed, 21831 insertions(+), 12232 deletions(-)
+ new file:
+   fem3d/aquabc_II.f90
+   fem3d/aquabc_II.h
+   fem3d/aquabc_II_apara.f
+   fem3d/aquabc_II_ased_ini.f90
+   fem3d/aquabc_II_co2sys.f90
+   fem3d/aquabc_II_fem_interface.f
+   fem3d/aquabc_II_pelagic_lib.f90
+   fem3d/aquabc_II_pelagic_model.f90
+   fem3d/aquabc_II_sediment_lib.f90
+   fem3d/aquabc_II_sediment_model_1.f90
+   fem3d/aquabc_II_util.f
+ deleted:
+    fem3d/alukas.f
+    fem3d/aquabc.f
+    fem3d/aquabc.h
+    fem3d/aquabc_fem_interface.f
+    fem3d/aquabc_sediment_model_1.f
+    fem3d/aquabc_util.f
+
+============================================================
+
 Thu Feb 26 10:47:05 CET 2015
 
 New version 7_1_5

diff --git a/LOG b/LOG
@@ -1,4 +1,9 @@
 
+27.02.2015
+
+aquabc_II added
+
+
 26.02.2015
 
 c ./femplot/supbas.f:

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,4 +1,9 @@
 
+27.02.2015    VERS_7_1_6
+
+	new version of aquabc_II integrated
+
+
 26.02.2015    VERS_7_1_5
 
 	new calling sequence for BC to avoid parallel bug (bnds_read_new)

diff --git a/VERSION b/VERSION
@@ -1,3 +1,5 @@
+version  7_1_5    26-02-2015    VERS_7_1_5   commit_2015-02-26
+
 version  7_1_5    26-02-2015    VERS_7_1_5
 
 ========================================================== 26-02-2015 - 7_1_5

diff --git a/fem3d/Makefile b/fem3d/Makefile
@@ -86,9 +86,14 @@ ifeq ($(ECOLOGICAL),ERSEM)
   LIBF_ERSEM     = $(DIRLIB)/lib$(LIBERSEM).a
 endif
 ifeq ($(ECOLOGICAL),AQUABC)
-  ECOLOGICAL_OBJ = aquabc_fem_interface.o alukas.o aquabc.o \
-		aquabc_sediment_model_1.o aquabc_util.o
+  ECOLOGICAL_OBJ = aquabc_II_pelagic_lib.o aquabc_II_fem_interface.o \
+		aquabc_II_co2sys.o aquabc_II_apara.o aquabc_II_util.o \
+		aquabc_II_sediment_model_1.o aquabc_II_sediment_lib.o \
+		aquabc_II_pelagic_model.o aquabc_II.o \
+		aquabc_II_ased_ini.o
 endif
+#  ECOLOGICAL_OBJ = aquabc_fem_interface.o alukas.o aquabc.o \
+#		aquabc_sediment_model_1.o aquabc_util.o
 
 #------------------------------------------------------------
 
@@ -645,7 +650,7 @@ headers:
 #------------------------------------------------
 
 depend:
-	$(MAKEDEPEND) *.f
+	$(MAKEDEPEND) *.f *.f90
 
 #---------------------------------------------------
 
@@ -786,10 +791,12 @@ last:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-aquabc.o: param.h
-aquabc_fem_interface.o: param.h bound_names.h aquabc.h femtime.h \
-		ev.h nlevel.h mkonst.h nbasin.h aquabc_aout.h \
-		levels.h basin.h diff_visc_fric.h 
+para_aqua.mod: aquabc_II_apara.o
+aquabc_II_fem_interface.o: aquabc_II.h param.h femtime.h nlevel.h \
+		mkonst.h nbasin.h aquabc_II_aout.h \
+		aquabc_II_sed_ini.mod levels.h basin.h \
+		para_aqua.mod diff_visc_fric.h 
+aquabc_II_util.o: param.h
 atoxi3d.o: nbasin.h param.h levels.h nlevel.h mkonst.h \
 		diff_visc_fric.h 
 basbathy.o: depth.h pkonst.h param.h evmain.h basin.h simul.h
@@ -1117,4 +1124,16 @@ windcrea.o: depth.h param.h evmain.h basin.h
 winmerge.o: param.h
 winshift.o: param.h
 zinit.o: param.h basin.h simul.h
+aquabc_II.o: param.h aquabc_II_sed_ini.mod para_aqua.mod
+aquabc_II_sed_ini.mod: aquabc_II_ased_ini.o
+aquabc_II_ased_ini.o: nbasin.h aquabc_II.h para_aqua.mod
+AQUABC_II_GLOBAL.mod: aquabc_II_co2sys.o
+VECTOR_MATRIX_UTILS.mod: aquabc_II_co2sys.o
+CO2SYS_CDIAC.mod: aquabc_II_co2sys.o
+aquabc_II_pelagic_lib.o: AQUABC_II_GLOBAL.mod
+aquabc_II_pelagic_model.o: param.h AQUABC_II_GLOBAL.mod \
+		CO2SYS_CDIAC.mod para_aqua.mod 
+aquabc_II_sediment_lib.o: AQUABC_II_GLOBAL.mod
+aquabc_II_sediment_model_1.o: param.h AQUABC_II_GLOBAL.mod \
+		CO2SYS_CDIAC.mod para_aqua.mod