- Add option where IG source term uses mean wave energy Eprev_ig in s…

.gitignore

@@ -65,3 +65,10 @@ source/third_party_open/netcdf/x64
 source/sfincs/sfincs.opt.yaml
 /source/sfincs_lib/*.yaml
 /source/third_party_open/netcdf/netcdf-fortran-4.6.1/Debug
+/source/build_nvfortran_gpu_h7.sh
+/source/build_nvfortran_gpu.sh
+/source/Singularityfile-gpu.def
+/source/Dockerfile.gpu.update01
+/source/Dockerfile.gpu.test
+/source/Dockerfile.gpu.25.5.ccall
+/source/Dockerfile.gpu

source/src/sfincs_data.f90

@@ -589,7 +589,10 @@ module sfincs_data
       real*4, dimension(:),   allocatable :: df      
       real*4, dimension(:),   allocatable :: dwig
       real*4, dimension(:),   allocatable :: dfig
-      real*4, dimension(:),   allocatable :: cg    
+      real*4, dimension(:),   allocatable :: cg
+      real*4, dimension(:),   allocatable :: cgig      
+      real*4, dimension(:),   allocatable :: qb
+      real*4, dimension(:),   allocatable :: gam      
       real*4, dimension(:),   allocatable :: betamean
       real*4, dimension(:),   allocatable :: srcig      
       real*4, dimension(:),   allocatable :: alphaig      

source/src/sfincs_domain.f90

@@ -2581,6 +2581,12 @@ subroutine initialize_hydro()
          dfig = 0.0   
          allocate(cg(np))
          cg = 0.0
+         allocate(cgig(np))
+         cgig = 0.0         
+         allocate(qb(np))
+         qb = 0.0   
+         allocate(gam(np))
+         gam = 0.0         
          allocate(betamean(np))
          betamean = 0.0     
          allocate(srcig(np))

source/src/sfincs_lib.f90

@@ -92,8 +92,8 @@ function sfincs_initialize() result(ierr)
    !
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !
-   build_revision = "$Rev: v2.3.1 mt. Faber"
-   build_date     = "$Date: 2025-12-18"
+   build_revision = "$Rev: v2.3.0+ mt. Faber:branch-281"
+   build_date     = "$Date: 2026-04-01"
    !
    call write_log('', 1)
    call write_log('------------ Welcome to SFINCS ------------', 1)

source/src/sfincs_ncoutput.F90

@@ -54,7 +54,7 @@ module sfincs_ncoutput
       integer :: patm_varid, wind_speed_varid, wind_dir_varid
       integer :: inp_varid, total_runtime_varid, average_dt_varid, status_varid  
       integer :: hm0_varid, hm0ig_varid, zsm_varid, tp_varid, tpig_varid, wavdir_varid, dirspr_varid
-      integer :: dw_varid, df_varid, dwig_varid, dfig_varid, cg_varid, beta_varid, srcig_varid, alphaig_varid
+      integer :: dw_varid, df_varid, dwig_varid, dfig_varid, cg_varid, cgig_varid, beta_varid, srcig_varid, alphaig_varid, qb_varid, gam_varid
       integer :: runup_gauge_name_varid, runup_gauge_zs_varid
       !
    end type
@@ -1849,6 +1849,27 @@ subroutine ncoutput_his_init()
          NF90(nf90_put_att(his_file%ncid, his_file%cg_varid, 'long_name', 'wave group velocity'))  
          NF90(nf90_put_att(his_file%ncid, his_file%cg_varid, 'coordinates', 'station_id station_name point_x point_y'))
          !               
+         NF90(nf90_def_var(his_file%ncid, 'cgig', NF90_FLOAT, (/his_file%points_dimid, his_file%time_dimid/), his_file%cgig_varid)) ! time-varying water level point
+         NF90(nf90_put_att(his_file%ncid, his_file%cgig_varid, '_FillValue', FILL_VALUE))
+         NF90(nf90_put_att(his_file%ncid, his_file%cgig_varid, 'units', 'm/s'))
+         NF90(nf90_put_att(his_file%ncid, his_file%cgig_varid, 'standard_name', 'infragravity_wave_velocity')) 
+         NF90(nf90_put_att(his_file%ncid, his_file%cgig_varid, 'long_name', 'infragravity wave velocity'))  
+         NF90(nf90_put_att(his_file%ncid, his_file%cgig_varid, 'coordinates', 'station_id station_name point_x point_y'))
+         !
+         NF90(nf90_def_var(his_file%ncid, 'qb', NF90_FLOAT, (/his_file%points_dimid, his_file%time_dimid/), his_file%qb_varid)) ! time-varying water level point
+         NF90(nf90_put_att(his_file%ncid, his_file%qb_varid, '_FillValue', FILL_VALUE))
+         NF90(nf90_put_att(his_file%ncid, his_file%qb_varid, 'units', '-'))
+         NF90(nf90_put_att(his_file%ncid, his_file%qb_varid, 'standard_name', 'fraction_breaking_waves')) 
+         NF90(nf90_put_att(his_file%ncid, his_file%qb_varid, 'long_name', 'fraction breaking incident waves'))  
+         NF90(nf90_put_att(his_file%ncid, his_file%qb_varid, 'coordinates', 'station_id station_name point_x point_y'))
+         !
+         NF90(nf90_def_var(his_file%ncid, 'gam', NF90_FLOAT, (/his_file%points_dimid, his_file%time_dimid/), his_file%gam_varid)) ! time-varying water level point
+         NF90(nf90_put_att(his_file%ncid, his_file%gam_varid, '_FillValue', FILL_VALUE))
+         NF90(nf90_put_att(his_file%ncid, his_file%gam_varid, 'units', '-'))
+         NF90(nf90_put_att(his_file%ncid, his_file%gam_varid, 'standard_name', 'local_wave_height_water_depth_ratio')) 
+         NF90(nf90_put_att(his_file%ncid, his_file%gam_varid, 'long_name', 'local wave height water depth ratio'))  
+         NF90(nf90_put_att(his_file%ncid, his_file%gam_varid, 'coordinates', 'station_id station_name point_x point_y'))
+         !               
          NF90(nf90_def_var(his_file%ncid, 'beta', NF90_FLOAT, (/his_file%points_dimid, his_file%time_dimid/), his_file%beta_varid)) ! time-varying water level point
          NF90(nf90_put_att(his_file%ncid, his_file%beta_varid, '_FillValue', FILL_VALUE))
          NF90(nf90_put_att(his_file%ncid, his_file%beta_varid, 'units', '-'))
@@ -2915,6 +2936,9 @@ subroutine ncoutput_update_his(t,nthisout)
    real*4, dimension(nobs) :: dwigobs
    real*4, dimension(nobs) :: dfigobs
    real*4, dimension(nobs) :: cgobs
+   real*4, dimension(nobs) :: cgigobs   
+   real*4, dimension(nobs) :: qbobs
+   real*4, dimension(nobs) :: gamobs   
    real*4, dimension(nobs) :: betaobs
    real*4, dimension(nobs) :: srcigobs
    real*4, dimension(nobs) :: alphaigobs
@@ -2938,6 +2962,9 @@ subroutine ncoutput_update_his(t,nthisout)
    dwobs        = FILL_VALUE
    dfobs        = FILL_VALUE
    cgobs        = FILL_VALUE
+   cgigobs      = FILL_VALUE   
+   qbobs        = FILL_VALUE
+   gamobs       = FILL_VALUE   
    betaobs      = FILL_VALUE
    srcigobs     = FILL_VALUE
    alphaigobs   = FILL_VALUE   
@@ -3038,7 +3065,10 @@ subroutine ncoutput_update_his(t,nthisout)
                dfobs(iobs)    = df(nm)
                dwigobs(iobs)  = dwig(nm)
                dfigobs(iobs)  = dfig(nm)
-               cgobs(iobs)    = cg(nm) 
+               cgobs(iobs)    = cg(nm)
+               cgigobs(iobs)  = cgig(nm)               
+               qbobs(iobs)    = qb(nm)
+               gamobs(iobs)   = gam(nm)               
                betaobs(iobs)  = betamean(nm)               
                srcigobs(iobs) = srcig(nm)               
                alphaigobs(iobs) = alphaig(nm)                              
@@ -3101,6 +3131,9 @@ subroutine ncoutput_update_his(t,nthisout)
          NF90(nf90_put_var(his_file%ncid, his_file%dfig_varid, dfigobs, (/1, nthisout/)))        
          !
          NF90(nf90_put_var(his_file%ncid, his_file%cg_varid, cgobs, (/1, nthisout/)))
+         NF90(nf90_put_var(his_file%ncid, his_file%cgig_varid, cgigobs, (/1, nthisout/)))         
+         NF90(nf90_put_var(his_file%ncid, his_file%qb_varid, qbobs, (/1, nthisout/)))
+         NF90(nf90_put_var(his_file%ncid, his_file%gam_varid, gamobs, (/1, nthisout/)))         
          !
          NF90(nf90_put_var(his_file%ncid, his_file%beta_varid, betaobs, (/1, nthisout/)))
          NF90(nf90_put_var(his_file%ncid, his_file%srcig_varid, srcigobs, (/1, nthisout/)))                  
@@ -3690,7 +3723,7 @@ subroutine ncoutput_add_params(ncid, varid)
    !
    ! Because of overlapping names, only important specific values from snapwave_data
    use snapwave_data, only: gamma, gammax, alpha, hmin, fw0, fw0_ig, dt, tol, dtheta, crit, nr_sweeps, baldock_opt, baldock_ratio, &
-       igwaves_opt, alpha_ig, gamma_ig, shinc2ig, alphaigfac, baldock_ratio_ig, ig_opt, herbers_opt, tpig_opt, eeinc2ig, tinc2ig, &
+       igwaves_opt, alpha_ig, gamma_ig, gamma_fac_br, shinc2ig, alphaigfac, baldock_ratio_ig, ig_opt, herbers_opt, tpig_opt, eeinc2ig, tinc2ig, &
        snapwave_jonswapfile, snapwave_encfile, snapwave_bndfile, snapwave_bhsfile, snapwave_btpfile, snapwave_bwdfile, snapwave_bdsfile, upwfile, gridfile
 
    !
@@ -3883,7 +3916,8 @@ subroutine ncoutput_add_params(ncid, varid)
         !
         NF90(nf90_put_att(ncid, varid, 'snapwave_igwaves',igwaves_opt))         
         NF90(nf90_put_att(ncid, varid, 'snapwave_alpha_ig',alpha_ig)) 
-        NF90(nf90_put_att(ncid, varid, 'snapwave_gammaig',gamma_ig)) 
+        NF90(nf90_put_att(ncid, varid, 'snapwave_gammaig',gamma_ig))
+        NF90(nf90_put_att(ncid, varid, 'snapwave_gamma_fac_br',gamma_fac_br))        
         NF90(nf90_put_att(ncid, varid, 'snapwave_shinc2ig',shinc2ig)) 
         NF90(nf90_put_att(ncid, varid, 'snapwave_alphaigfac',alphaigfac)) 
         NF90(nf90_put_att(ncid, varid, 'snapwave_baldock_ratio_ig',baldock_ratio_ig))