Skip to content

Commit

Permalink
femadj converted to include
Browse files Browse the repository at this point in the history
  • Loading branch information
@georgu
georgu committed Jan 19, 2015
1 parent d8ccf06 commit 939eb13
Show file tree
Hide file tree
Showing 27 changed files with 923 additions and 691 deletions.
42 changes: 42 additions & 0 deletions COMMIT
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
============================================================

Mon Jan 19 12:48:40 CET 2015

femadj converted to include

fem3d/bin/newsubst.pl | 92 +++++++++---------
femadj/adj4el.f | 46 +++++-----
femadj/adj575.f | 116 +++++++++++------------
femadj/adj5el.f | 144 ++++++++++++++---------------
femadj/adj7el.f | 94 +++++++++----------
femadj/adjele.f | 114 +++++++++++++----------
femadj/adjneu.f | 163 ++++++++++++---------------------
femadj/adjplo.f | 136 +++++++++++-----------------
femadj/adjvar.f | 80 ++--------------
femadj/basin.h | 55 +++++++----
femadj/depth.h | 22 +++++
femadj/param_dummy.h | 22 +++++
femadj/pkonst.h | 11 ++
femadj/subgrd.f | 136 +++++++++++++---------------
femadj/subgrd.h | 13 +++
femadj/subsss.f | 204 ++++++++++++++++++++++++++++++++++++-----
fembin/mail_shyfem.sh | 27 +++++-
fembin/shyfem_install_hard.pl | 10 +-
femcheck/test_compile.sh | 2 +-
femdoc/final/shyfem.pdf | Bin 293711 -> 293711 bytes
femdoc/final/shyfem.ps | 10 +-
femspline/basin.h | 37 ++++++++
femspline/param_dummy.h | 22 +++++
femspline/pkonst.h | 11 ++
femspline/subgrd.h | 13 +++
25 files changed, 884 insertions(+), 696 deletions(-)
new file:
femadj/depth.h
femadj/param_dummy.h
femadj/pkonst.h
femadj/subgrd.h
femspline/basin.h
femspline/param_dummy.h
femspline/pkonst.h
femspline/subgrd.h

============================================================

Fri Jan 16 17:40:01 CET 2015

still intermediate, eliminated warnings
Expand Down
2 changes: 2 additions & 0 deletions VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
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
Expand Down
92 changes: 46 additions & 46 deletions fem3d/bin/newsubst.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,52 +46,52 @@
if( $::subst ) {
subst_femtim($fortran);
subst_konst($fortran);
#subst_ts($fortran);
#subst_levels($fortran);
#subst_depth($fortran);
#subst_meteo($fortran);
#subst_hydro($fortran);
#subst_hydro_vel($fortran);
#subst_hydro_print($fortran);
#subst_hydro_plot($fortran);
#subst_plot_aux($fortran);
#subst_plot_supout($fortran);
#subst_basin($fortran);
#subst_geom_dynamic($fortran);
#subst_geom($fortran);
#subst_tides($fortran);
#subst_diff_visc_fric($fortran);
#subst_waves($fortran);
#subst_bound_geom($fortran);
#subst_hydro_baro($fortran);
#subst_sinking($fortran);
#subst_simul($fortran);
#subst_area($fortran);
#subst_aux_array($fortran);
#subst_turbulence($fortran);
#subst_bound_dynamic($fortran);
#subst_bound_names($fortran);
#subst_roughness($fortran);
#subst_internal($fortran);
#subst_diff_aux($fortran);
#subst_bnd_aux($fortran);
#subst_fluidmud($fortran);
#subst_volcomp($fortran);
#subst_nudging($fortran);
#subst_gotm($fortran);
#subst_conz($fortran);
#subst_nohyd($fortran);
#subst_extra($fortran);
#subst_const_aux($fortran);
#subst_debug($fortran);
#subst_coords($fortran);
#subst_sigma($fortran);
#subst_histo($fortran);
#subst_stab($fortran);
#subst_grd($fortran);
#subst_semi($fortran);
#subst_subnls($fortran);
#subst_reg($fortran);
subst_ts($fortran);
subst_levels($fortran);
subst_depth($fortran);
subst_meteo($fortran);
subst_hydro($fortran);
subst_hydro_vel($fortran);
subst_hydro_print($fortran);
subst_hydro_plot($fortran);
subst_plot_aux($fortran);
subst_plot_supout($fortran);
subst_basin($fortran);
subst_geom_dynamic($fortran);
subst_geom($fortran);
subst_tides($fortran);
subst_diff_visc_fric($fortran);
subst_waves($fortran);
subst_bound_geom($fortran);
subst_hydro_baro($fortran);
subst_sinking($fortran);
subst_simul($fortran);
subst_area($fortran);
subst_aux_array($fortran);
subst_turbulence($fortran);
subst_bound_dynamic($fortran);
subst_bound_names($fortran);
subst_roughness($fortran);
subst_internal($fortran);
subst_diff_aux($fortran);
subst_bnd_aux($fortran);
subst_fluidmud($fortran);
subst_volcomp($fortran);
subst_nudging($fortran);
subst_gotm($fortran);
subst_conz($fortran);
subst_nohyd($fortran);
subst_extra($fortran);
subst_const_aux($fortran);
subst_debug($fortran);
subst_coords($fortran);
subst_sigma($fortran);
subst_histo($fortran);
subst_stab($fortran);
subst_grd($fortran);
subst_semi($fortran);
subst_subnls($fortran);
subst_reg($fortran);

treat_includes($fortran);
#check_common($fortran);
Expand Down
46 changes: 23 additions & 23 deletions femadj/adj4el.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@
c
c***********************************************************

subroutine eliml(nkn,nel,ngrdim,ngrade,nbound,ngri,nen3v)
subroutine elimlow

c eliminates grade=4 nodes (and less)

implicit none

integer nkn,nel,ngrdim
integer ngrade(1)
integer nbound(1)
integer ngri(2*ngrdim,1)
integer nen3v(3,1)
include 'param.h'
include 'basin.h'
include 'grade.h'

logical b3
integer k,n,nc
Expand All @@ -41,7 +39,7 @@ subroutine eliml(nkn,nel,ngrdim,ngrade,nbound,ngri,nen3v)
if( nbound(k) .eq. 0 ) then
n = ngrade(k)
if( n .eq. 3 ) then
call elim3(k,nkn,nel,ngrdim,ngrade,ngri,nen3v)
call elim3(k)
b3 = .true.
nc = nc + 1
end if
Expand All @@ -57,7 +55,7 @@ subroutine eliml(nkn,nel,ngrdim,ngrade,nbound,ngri,nen3v)
if( nbound(k) .eq. 0 ) then
n = ngrade(k)
if( n .eq. 4 ) then
call elim4(k,nkn,nel,ngrdim,ngrade,ngri,nen3v)
call elim4(k)
call chkgrd !FIXME
end if
end if
Expand All @@ -67,16 +65,17 @@ subroutine eliml(nkn,nel,ngrdim,ngrade,nbound,ngri,nen3v)

c***********************************************************

subroutine elim3(k,nkn,nel,ngrdim,ngrade,ngri,nen3v)
subroutine elim3(k)

c eliminates node

implicit none

integer k,nkn,nel,ngrdim
integer ngrade(1)
integer ngri(2*ngrdim,1)
integer nen3v(3,1)
include 'param.h'
include 'basin.h'
include 'grade.h'

integer k

integer i,n,kk,ie
integer neibs(30),ngneib(30)
Expand Down Expand Up @@ -112,30 +111,31 @@ subroutine elim3(k,nkn,nel,ngrdim,ngrade,ngri,nen3v)

ie = ifindel(neibs(2),neibs(3),k)
if( ie .eq. 0 ) stop 'error stop elim3: internal error (1)'
call delele(ie,nkn,nel,ngrdim,ngrade,ngri)
call delele(ie)

ie = ifindel(neibs(3),neibs(1),k)
if( ie .eq. 0 ) stop 'error stop elim3: internal error (1)'
call delele(ie,nkn,nel,ngrdim,ngrade,ngri)
call delele(ie)

c delete node

call delnod(k,nkn,nel,ngrdim,ngrade,ngri)
call delnod(k)

end

c***********************************************************

subroutine elim4(k,nkn,nel,ngrdim,ngrade,ngri,nen3v)
subroutine elim4(k)

c eliminates node

implicit none

integer k,nkn,nel,ngrdim
integer ngrade(1)
integer ngri(2*ngrdim,1)
integer nen3v(3,1)
include 'param.h'
include 'basin.h'
include 'grade.h'

integer k

integer i,n,k1,k2
integer ipos,ipos1,ipos2
Expand Down Expand Up @@ -290,14 +290,14 @@ subroutine elim4(k,nkn,nel,ngrdim,ngrade,ngri,nen3v)

do i=4,3,-1
ie = ielem(i)
call delele(ie,nkn,nel,ngrdim,ngrade,ngri)
call delele(ie)
end do

c write(6,*) '***',1764,(nen3v(ii,1764),ii=1,3)

c eliminate node

call delnod(k,nkn,nel,ngrdim,ngrade,ngri)
call delnod(k)

c write(6,*) '***',1764,(nen3v(ii,1764),ii=1,3)

Expand Down
Loading

0 comments on commit 939eb13

Please sign in to comment.