Fixed some issues with gnu make utility

schism-dev · Jul 12, 2024 · cd79012 · cd79012
1 parent cfb58a5
commit cd79012
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 12 deletions.
diff --git a/src/Hydro/misc_subs.F90 b/src/Hydro/misc_subs.F90
@@ -6398,7 +6398,7 @@ SUBROUTINE get_WW3_arrays(WW3__OHS,WW3__DIR,WW3_T0M1,WW3__WNM,WW3__BHD,WW3_USSX,
         wave_dir(1:np)=WW3__DIR !mean wave dir [deg]
         wave_tm1(1:np)=WW3_T0M1 !mean wave period [s]
         wave_wnm(1:np)=WW3__WNM !mean wave number [1/m]
-        wave_pres(1:np)=WW3__BHD !wave-induced Bernoulli head pressure [N/m or Pa?]
+        wave_pres(1:np)=WW3__BHD !wave-induced Bernoulli head pressure [m^2/s/s]
         wave_stokes_x(1:np)=WW3_USSX !Stokes drift [m/s]
         wave_stokes_y(1:np)=WW3_USSY 
         wave_ocean_flux_x(1:np)=WW3_TWOX !wave-ocean mom flux [m2/s2]

diff --git a/src/Makefile b/src/Makefile
@@ -480,7 +480,8 @@ $(FABMINSTALLDIR)/lib/libfabm.a:
 
 
 src_extension := .f90
-util_lib_src := schism_geometry.f90 pt_in_poly.f90 pt_in_poly2.f90 extract_mod.f90 compute_zcor.f90 stat_pool.f90 stat_pool.f90 stripsearch_unstr.f90 argparse.f90 netcdf_var_names.f90 moving_average_filter.f90
+util_lib_src := schism_geometry.f90 argparse.f90  extract_mod2.f90  interpolate_unstructured_module.f90  pt_in_poly_test.f90  stripesearch_unstr.f90 compute_zcor.f90 extract_mod.f90 julian_date.f90                     
+
 util_lib_obj := $(subst $(src_extension),.o,$(util_lib_src))
 util_lib_config_objs := $(addprefix o/$(config)/, $(util_lib_obj))
 

diff --git a/src/Readme.beta_notes b/src/Readme.beta_notes
@@ -10,7 +10,7 @@ This beta notes are divided into 5 part:
 Github versions:
 
 - `0fec598` (20 May 2024): added nbins_veg_vert as a mandatory input; veg_vert_z*(1:nbins_veg_vert+1) 
-                           etc as optional. These are required if iveg/=0;
+                           etc as optional. The latter are required if iveg/=0;
 - `56b88ae` (17 May 2024): added station outputs for all tracers (flags in station.in after w);
 - `e66f1b3` (3 May 2024): renamed sav_*.gr3 as veg_*.gr3; also MARSH module now requires iveg/=0;
 - `ca44ba0` (1 May 2024): removed isav and replaced it with iveg
@@ -605,6 +605,7 @@ git versions:
 150. `66242aa` (Sept 13, 2023): removed goto in harm.F90
 151. `5914ae2` (Mar 26, 2024): fix an init error for diffm* (c/o Ufuk)
 161. `ca44ba0` (1 May 2024): fixed bugs in vegetation&marsh module (uninited sav_h0 etc) 
+162. `cfb58a5` [5 July 2024] replace fatal errors with warning in btrack (no intersecting edges). These are exaordinary exceptions that occur rarely.
 
 ================================================================================================
 (D) Auto-test history:

diff --git a/src/Utility/ACE/xmgredit5/vers.c b/src/Utility/ACE/xmgredit5/vers.c
@@ -1 +1 @@
-char compiled_version[] = "Version A.916 Thu Dec 20 16:36:38 EST 2018";
+char compiled_version[] = "Version A.916 Thu Jul 11 10:11:08 EDT 2024";
diff --git a/src/Utility/ACE/xmgredit5/version b/src/Utility/ACE/xmgredit5/version
@@ -1 +1 @@
-915
+916
diff --git a/...pts/interpolate_depth_structured2_mpi.f90 → ...pts/interpolate_depth_structured2_mpi.F90 b/...pts/interpolate_depth_structured2_mpi.f90 → ...pts/interpolate_depth_structured2_mpi.F90
@@ -22,8 +22,8 @@
 !             (4) Also remember to edit min depth and datum diff's to be imposed for each tile below ('new22')
 !     Output: hgrid.new (for pts outside the DEMs or the DEM depth is junk there, 
 !                        the original depths are preserved).
-!     mpif90 -O2 -mcmodel=medium -o interpolate_depth_structured2_mpi interpolate_depth_structured2_mpi.f90
-!     mpiifort -O2 -mcmodel=medium -o interpolate_depth_structured2_mpi interpolate_depth_structured2_mpi.f90
+!     mpif90 -O2 -mcmodel=medium -o interpolate_depth_structured2_mpi interpolate_depth_structured2_mpi.F90
+!     mpiifort -O2 -mcmodel=medium -o interpolate_depth_structured2_mpi interpolate_depth_structured2_mpi.F90
 
       program load_dems
       implicit real*8(a-h,o-z)

diff --git a/...ng-Fortran/compute_skill_unstructured.f90 → ...-Fortran/compute_skill_unstructured.f90.0 b/...ng-Fortran/compute_skill_unstructured.f90 → ...-Fortran/compute_skill_unstructured.f90.0
diff --git a/src/Utility/Pre-Processing/fix_bad_quads.f90 b/src/Utility/Pre-Processing/fix_bad_quads.f90
@@ -198,10 +198,13 @@
       do i=1,np
         write(12,'(i12,2(1x,e22.14),1x,e16.5)')i,xnd(i),ynd(i),dp(i) 
       enddo !i
+      nquads=0
       do i=1,ne
         write(12,*)i,i34_new(i),elnode_new(1:i34_new(i),i)
+        if(i34_new(i)==4) nquads=nquads+1
       enddo !i
       close(12)
+      print*, '# of quads remaining=',nquads
 
       stop
       end

diff --git a/src/Utility/Pre-Processing/process_river.m b/src/Utility/Pre-Processing/process_river.m
@@ -5,14 +5,15 @@
 %        hgrid.gr3 (lon in [-180,180])
 %        coastal-stns-Vol-monthly.updated-May2019.nc (Dai&Trenberth via ucar)
 %        dates below
-%Outputs: source_sink.in, vsource.th, msource.th (-9999 for T; 30PSU for S). Time step is 1 day and may need pad 
+%Outputs: source_sink.in, vsource.th, msource.th (-9999 for T; S specified by user). Time step is 1 day and may need pad 
 %         extra record for last model step
 
 clear all; close all;
 
-%Output  info
-start_yr=2018; end_yr=2018;
-start_mon=1; end_mon=12;
+%Output info
+river_S=30;
+start_yr=2017; end_yr=2018;
+start_mon=12; end_mon=12;
 start_day=1; end_day=31; %GMT
 
 %Location
@@ -126,7 +127,7 @@
 fid=fopen('vsource.th','w');
 fid2=fopen('msource.th','w');
 fprintf(fid,[out_char '\n'],[timeout2*86400; out_flow3]);
-fprintf(fid2,[out_char2 '\n'],[timeout2*86400; -9999*ones(nriv_out2,nstep); 30*ones(nriv_out2,nstep)]);
+fprintf(fid2,[out_char2 '\n'],[timeout2*86400; -9999*ones(nriv_out2,nstep); river_S*ones(nriv_out2,nstep)]);
 fclose(fid); fclose(fid2);
 
 fid=fopen('source_sink.in','w');