consolidating commit

jalessandri · Jan 19, 2015 · ada5e24 · ada5e24
1 parent 939eb13
commit ada5e24
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 26 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,21 @@
 ============================================================
 
+Mon Jan 19 15:04:22 CET 2015
+
+consolidating commit
+
+ Makefile                |    1 +
+ fem3d/param.h           |    6 +++---
+ fem3d/sedi3d.f          |   34 ++++++++++++++++++++--------------
+ femadj/param.h          |    6 +++---
+ femdoc/final/shyfem.pdf |  Bin 293711 -> 293711 bytes
+ femdoc/final/shyfem.ps  |    4 ++--
+ femplot/param.h         |    6 +++---
+ param.h                 |    6 +++---
+ 8 files changed, 35 insertions(+), 28 deletions(-)
+
+============================================================
+
 Mon Jan 19 12:48:40 CET 2015
 
 femadj converted to include

diff --git a/Makefile b/Makefile
@@ -39,6 +39,7 @@ DIRLIB    = $(FEMDIR)/femlib
 FEMSRC    = $(FEMDIR)/fem3d
 FEMBIN    = $(FEMDIR)/fembin
 TMPDIR    = $(HOME)/fem/tmp
+ACTFEMDIR = `pwd`
 
 REGRESSDIR = femregres/tests
 

diff --git a/VERSION b/VERSION
@@ -1,5 +1,7 @@
 version  7_1_1    15-01-2015    VERS_7_1_1   commit_2015-01-19
 
+version  7_1_1    15-01-2015    VERS_7_1_1   commit_2015-01-19
+
 version  7_1_1    15-01-2015    VERS_7_1_1   commit_2015-01-16
 
 version  7_1_1    15-01-2015    VERS_7_1_1   commit_2015-01-16

diff --git a/fem3d/param.h b/fem3d/param.h
@@ -21,9 +21,9 @@
 
 	integer nbdydim			!maximum particles for lagrange model
 
-	parameter ( nkndim = 11000 )
-	parameter ( neldim = 22000 )
-	parameter ( nlvdim = 1 )
+	parameter ( nkndim = 15000 )
+	parameter ( neldim = 30000 )
+	parameter ( nlvdim = 21 )
 
 	parameter ( mbwdim = 300 )
 	parameter ( ngrdim = 12 )

diff --git a/fem3d/sedi3d.f b/fem3d/sedi3d.f
@@ -75,7 +75,8 @@
 c 13.04.2010    ccf     introduce SSC effect on density
 c 27.07.2010    ccf     settling velocity for cohesive sedimen in function of space
 c 20.06.2011    ccf     load for erosion deposition for both cohesive and non-cohesive
-c			deleted suspco routine
+c 20.06.2011	ccf	deleted suspco routine
+c 19.01.2015    ccf     ia_out1/2 introduced
 c
 !****************************************************************************
 
@@ -173,7 +174,7 @@ subroutine sedi(it,dt)
       parameter ( fact = 1. )
       real load(nlvdim,nkndim)
       integer itmsed,idtsed 		!output parameter
-      integer ia_out(4)
+      integer ia_out1(4),ia_out2(4)
 
 ! function
       integer iround
@@ -182,7 +183,7 @@ subroutine sedi(it,dt)
       logical has_output,next_output
 
 ! save and data
-      save ia_out
+      save ia_out1, ia_out2
       save what
       save itmsed,idtsed
       save sedkpar,difmol
@@ -316,11 +317,14 @@ subroutine sedi(it,dt)
 !	  Initialize output
 !         --------------------------------------------------
 
-          call init_output('itmsed','idtsed',ia_out)
+          call init_output('itmsed','idtsed',ia_out1)
+          call init_output('itmsed','idtsed',ia_out2)
 
-          if( has_output(ia_out) ) then
-             call open_scalar_file(ia_out,1,5,'nos')
-             call open_scalar_file(ia_out,nlv,1,'sco')
+          if( has_output(ia_out1) ) then
+             call open_scalar_file(ia_out1,1,5,'sed')
+          end if
+          if( has_output(ia_out2) ) then
+             call open_scalar_file(ia_out2,nlv,1,'sco')
           end if
 
           write(6,*) 'sediment model initialized...'
@@ -412,14 +416,16 @@ subroutine sedi(it,dt)
 !       Write of results (files SED and SCO)
 !       -------------------------------------------------------------------
 
-        if( next_output(ia_out) ) then
-          call write_scalar_file(ia_out,80,1,bh)
-          call write_scalar_file(ia_out,81,1,gskm)
-          call write_scalar_file(ia_out,82,1,tao)
-          call write_scalar_file(ia_out,83,1,hkv)
-          call write_scalar_file(ia_out,84,1,totbed)
+        if( next_output(ia_out1) ) then
+          call write_scalar_file(ia_out1,80,1,bh)
+          call write_scalar_file(ia_out1,81,1,gskm)
+          call write_scalar_file(ia_out1,82,1,tao)
+          call write_scalar_file(ia_out1,83,1,hkv)
+          call write_scalar_file(ia_out1,84,1,totbed)
+        end if
 
-          call write_scalar_file(ia_out,85,nlv,tcn)
+        if( next_output(ia_out2) ) then
+          call write_scalar_file(ia_out2,85,nlv,tcn)
         end if
 
 ! -------------------------------------------------------------------

diff --git a/femadj/param.h b/femadj/param.h
@@ -21,9 +21,9 @@
 
 	integer nbdydim			!maximum particles for lagrange model
 
-	parameter ( nkndim = 11000 )
-	parameter ( neldim = 22000 )
-	parameter ( nlvdim = 1 )
+	parameter ( nkndim = 15000 )
+	parameter ( neldim = 30000 )
+	parameter ( nlvdim = 21 )
 
 	parameter ( mbwdim = 300 )
 	parameter ( ngrdim = 12 )

diff --git a/femdoc/final/shyfem.pdf b/femdoc/final/shyfem.pdf
diff --git a/femdoc/final/shyfem.ps b/femdoc/final/shyfem.ps
diff --git a/femplot/param.h b/femplot/param.h
@@ -21,9 +21,9 @@
 
 	integer nbdydim			!maximum particles for lagrange model
 
-	parameter ( nkndim = 11000 )
-	parameter ( neldim = 22000 )
-	parameter ( nlvdim = 1 )
+	parameter ( nkndim = 15000 )
+	parameter ( neldim = 30000 )
+	parameter ( nlvdim = 21 )
 
 	parameter ( mbwdim = 300 )
 	parameter ( ngrdim = 12 )

diff --git a/param.h b/param.h
@@ -21,9 +21,9 @@
 
 	integer nbdydim			!maximum particles for lagrange model
 
-	parameter ( nkndim = 11000 )
-	parameter ( neldim = 22000 )
-	parameter ( nlvdim = 1 )
+	parameter ( nkndim = 15000 )
+	parameter ( neldim = 30000 )
+	parameter ( nlvdim = 21 )
 
 	parameter ( mbwdim = 300 )
 	parameter ( ngrdim = 12 )