final polishing with new mpi code and wrt computation

Author: georgu

COMMIT

@@ -1,5 +1,31 @@
 ============================================================
 
+Thu Apr 19 16:58:14 CEST 2018
+
+final polishing with new mpi code and wrt computation
+
+ LOG                              |  66 ++++++++++++++++++++++++++++++++++++++
+ RELEASE_NOTES                    |   9 ++++++
+ fem3d/MPI_todo                   |   1 +
+ fem3d/Makefile                   |  13 ++++----
+ fem3d/mod_shympi_node.f          |   2 +-
+ fem3d/mod_shympi_node_internal.f |   2 +-
+ fem3d/shypre.f                   |   1 +
+ fem3d/subnev.f                   |  18 +++++------
+ fem3d/subver.f                   |   7 ++--
+ fem3d/subwrt.f                   |  67 +++++++++++++++++++++++++++------------
+ femdoc/final/shyfem.pdf          | Bin 293477 -> 293480 bytes
+ femplot/Makefile                 |   3 +-
+ femplot/col.f                    |  12 ++++---
+ femplot/mod_hydro_plot.f         |   3 ++
+ femplot/supbas.f                 |   2 ++
+ femplot/supiso.f                 |   5 +++
+ femplot/supout.f                 |   8 ++++-
+ femplot/supsim.f                 |   9 ++++--
+ 18 files changed, 177 insertions(+), 51 deletions(-)
+
+============================================================
+
 Wed Apr 18 18:47:01 CEST 2018
 
 some work on WRT, cleaned up mpi

LOG

@@ -1,4 +1,70 @@
 
+19.04.2018
+
+c ./fem3d/shypre.f:
+c 13.04.2018    ggu     accepts partition to write bas file with node partition
+c
+c ./femplot/supiso.f:
+c 18.04.2018    ggu     use bplot to decide what element to plot
+c
+c ./femplot/supout.f:
+c 18.04.2018  ggu     set up bkplot (node to be plotted)
+c
+c ./femplot/supbas.f:
+c 18.04.2018  ggu     use also bkplot to decide what part of boundary to plot
+c
+c ./fem3d/basutil.f:
+! 13.04.2018	ggu	new routine for partitioning
+!
+c ./fem3d/subshyutil.f:
+! 10.04.2018    ggu     prepare for mpi version (collect array and write)
+! 11.04.2018    ggu     bug fix and hydro write
+!
+c ./fem3d/shybas.f:
+c 04.04.2018    ggu     new code for real area (m) and explicit stability
+c 04.04.2018    ggu     new code for nodal partition check and write
+c 13.04.2018    ggu     new routine to elab partition and write to file
+c
+c ./fem3d/subtime.f:
+c 13.04.2018    ggu     hydro_stability includes explicit gravity wave
+c 13.04.2018    ggu     set_timestep now is working with mpi
+c 16.04.2018    ggu     write warning if time step is over recommended one
+c
+c ./fem3d/subn11.f:
+c 04.04.2018    ggu     initialization for zeta revised for mpi
+c
+c ./fem3d/basutil_part.f:
+! 16.04.2018    ggu     partitioning finished
+c
+c ./fem3d/mod_shympi_dummy.f:
+! 10.04.2018    ggu     adjourned with new function calls
+!
+c ./fem3d/subousa.f:
+c 11.04.2018	ggu	mpi version is ready and working
+c
+c ./fem3d/mod_shympi_node_internal.f:
+! 10.04.2018    ggu     code to exchange arrays
+!
+c ./fem3d/subscn.f:
+! 10.04.2018	ggu	ialfa now handles ndec < -1 gracefully
+!
+c ./fem3d/newstab.f:
+c 13.04.2018    ggu	re-structured, included gravity wave stability
+c 16.04.2018    ggu	use also ilin to compute stability
+c
+c ./fem3d/mod_shympi_node.f:
+! 04.04.2018    ggu     new routine shympi_exit
+! 04.04.2018    ggu     bug fix on scalar reduction (argument was changed)
+! 10.04.2018    ggu     code to exchange arrays
+!
+c ./fem3d/subwrt.f:
+c 16.04.2018	ggu	restructured, new computation of WRT (see WRTOLD)
+c 18.04.2018	ggu	restructured, some bugs fixed
+c
+c ./fem3d/subshy.f:
+! 10.04.2018    ggu     allow for file to be initialized but not opened
+
+
 03.04.2018
 
 c ./fem3d/subtime.f:

RELEASE_NOTES

@@ -1,4 +1,13 @@
 
+19.04.2018	VERS_7_5_45
+
+	first working version for MPI with partition on nodes
+	writing shy and ext files under mpi
+	for shyplot new bkplot
+	for shybas and shypre new code for partition
+	stability computation also with gravity wave
+	wrt made ready for mpi
+
 03.04.2018	VERS_7_5_44
 
 	time management now fully in double precision

VERSION

@@ -1,3 +1,5 @@
+version  7_5_44    03-04-2018    VERS_7_5_44   commit_2018-04-19
+
 version  7_5_44    03-04-2018    VERS_7_5_44   commit_2018-04-18
 
 version  7_5_44    03-04-2018    VERS_7_5_44   commit_2018-04-15

fem3d/MPI_todo

@@ -4,6 +4,7 @@ nadist
 lagrangian
 semi-implicit
 fluxes
+area
 tilting
 off-line
 box-model

fem3d/Makefile

@@ -842,6 +842,8 @@ last:
 ../femlib/mod/PROCEDURE.mod: mod_shympi_dummy.o
 ../femlib/mod/PROCEDURE.mod: mod_shympi_dummy.o
 ../femlib/mod/PROCEDURE.mod: mod_shympi_dummy.o
+../femlib/mod/PROCEDURE.mod: mod_shympi_dummy.o
+../femlib/mod/PROCEDURE.mod: mod_shympi_node.o
 ../femlib/mod/PROCEDURE.mod: mod_shympi_node.o
 ../femlib/mod/PROCEDURE.mod: mod_shympi_node.o
 ../femlib/mod/PROCEDURE.mod: mod_shympi_node.o
@@ -1003,14 +1005,14 @@ basutil_box.o: ../femlib/mod/basin.mod ../femlib/mod/basutil.mod \
 		../femlib/mod/evgeom.mod \
 		../femlib/mod/mod_depth.mod \
 		../femlib/mod/mod_geom.mod 
-basutil_custom.o: ../femlib/mod/basin.mod \
-		../femlib/mod/basutil.mod ../femlib/mod/evgeom.mod \
-		../femlib/mod/grd.mod ../femlib/mod/mod_depth.mod \
-		../femlib/mod/mod_geom.mod 
 basutil_hsigma.o: ../femlib/mod/basin.mod \
 		../femlib/mod/mod_depth.mod 
 basutil_interp.o: ../femlib/mod/basin.mod \
 		../femlib/mod/mod_depth.mod param.h 
+basutil_part.o: ../femlib/mod/basin.mod ../femlib/mod/basutil.mod \
+		../femlib/mod/evgeom.mod ../femlib/mod/grd.mod \
+		../femlib/mod/mod_depth.mod \
+		../femlib/mod/mod_geom.mod 
 basutil_resol.o: ../femlib/mod/basin.mod ../femlib/mod/basutil.mod \
 		../femlib/mod/mod_depth.mod 
 basutil_smooth.o: ../femlib/mod/basin.mod \
@@ -1262,8 +1264,7 @@ newpoi.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
 newrog.o: ../femlib/mod/basin.mod param.h
 newstab.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
 		../femlib/mod/mod_diff_visc_fric.mod \
-		../femlib/mod/mod_hydro.mod \
-		../femlib/mod/shympi.mod femtime.h pkonst.h 
+		../femlib/mod/mod_hydro.mod femtime.h pkonst.h 
 newtra.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
 		../femlib/mod/levels.mod \
 		../femlib/mod/mod_depth.mod \

fem3d/mod_shympi_node.f

@@ -326,7 +326,7 @@ subroutine shympi_init(b_want_mpi)
 	nkn_unique = nkn
 	nel_unique = nel
 
-	write(6,*) 'calling shympi_init_internal'
+	!write(6,*) 'calling shympi_init_internal'
 	call shympi_init_internal(my_id,n_threads)
 	!call check_part_basin('nodes')
 

fem3d/mod_shympi_node_internal.f

@@ -90,7 +90,7 @@ subroutine shympi_init_internal(my_id,n_threads)
 	bpmaster = ( my_p_id == 0 )
 	bpmpi = ( n_p_threads > 1 )
 
-	write(6,*) 'MPI internally initialized: ',my_id,n_threads
+	!write(6,*) 'MPI internally initialized: ',my_id,n_threads
 
 	end subroutine shympi_init_internal
 

fem3d/shypre.f

@@ -32,6 +32,7 @@
 c 04.10.2013    ggu     in optest better error handling
 c 30.07.2015    ggu     vp renamed to shypre
 c 17.11.2017    ggu     implement output switches (quiet,silent,etc..)
+c 13.04.2018    ggu     accepts partition to write bas file with node partition
 c
 c notes :
 c

fem3d/subnev.f

@@ -427,7 +427,7 @@ subroutine check_spheric_ev
 	  stop 'error stop check_spheric_ev: isphe'
 	end if
 
-	if( shympi_is_master() ) then
+	if( shympi_is_master() .and. bmpi_debug ) then
 	  write(6,*) 'isphe_mpi: ',my_id,isphe
 	end if
 
@@ -439,21 +439,21 @@ subroutine check_spheric_ev
 	isphe_ev = isphe
 	init_ev = .true.
 
-	if( shympi_is_master() ) then
+	if( shympi_is_master() .and. verbose_ev ) then
 	  if( isphe == 1 ) then
 	    write(6,*) 'using lat/lon coordinates'
 	  else
 	    write(6,*) 'using cartesian coordinates'
 	  end if
 	end if
 
-	if( verbose_ev ) then
-	 if( isphe == 1 ) then
-	  write(6,*) 'using lat/lon coordinates'
-	 else
-	  write(6,*) 'using cartesian coordinates'
-	 end if
-	end if
+	!if( verbose_ev ) then
+	! if( isphe == 1 ) then
+	!  write(6,*) 'using lat/lon coordinates'
+	! else
+	!  write(6,*) 'using cartesian coordinates'
+	! end if
+	!end if
 
 	end