more changes due to x,y outputs in double precision

schism-dev · Apr 2, 2021 · b43afea · b43afea
1 parent e40d7a3
commit b43afea
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/src/Utility/Combining_Scripts/CMakeLists.txt b/src/Utility/Combining_Scripts/CMakeLists.txt
@@ -3,13 +3,13 @@ add_definitions(${C_PREPROCESS_FLAG})
 add_executable( combine_gr3 combine_gr3.f90 )
 #add_executable( combine_outHA combine_outHA.f90 )
 add_executable( combine_hotstart7 combine_hotstart7.f90 )
-add_executable( combine_output10 combine_output10.f90 netcdf_var_names.f90)
+##add_executable( combine_output10 combine_output10.f90 netcdf_var_names.f90)
 add_executable( combine_output11 combine_output11.f90 netcdf_var_names.f90)
 
 target_link_libraries (combine_hotstart7 utillib ${NetCDFLIBS} ${HDF5_LIBRARIES})
-target_link_libraries (combine_output10 utillib ${NetCDFLIBS} ${HDF5_LIBRARIES} )
+##target_link_libraries (combine_output10 utillib ${NetCDFLIBS} ${HDF5_LIBRARIES} )
 target_link_libraries (combine_output11 utillib ${NetCDFLIBS} ${HDF5_LIBRARIES} )
 
 
-add_dependencies(utility combine_gr3 combine_hotstart7 combine_output10 combine_output11)
+add_dependencies(utility combine_gr3 combine_hotstart7 combine_output11)
 
diff --git a/src/Utility/OneWayNestScripts/interpolate_variables7.f90 b/src/Utility/OneWayNestScripts/interpolate_variables7.f90
@@ -290,11 +290,11 @@ program interpolate
               nwild(1:3)=(/1,3,4/)
             endif !j
             n1=elnode(nwild(1),ie); n2=elnode(nwild(2),ie); n3=elnode(nwild(3),ie)
-            ar1=signa_single(xfg(i),x(n2),x(n3),yfg(i),y(n2),y(n3))  
-            ar2=signa_single(x(n1),xfg(i),x(n3),y(n1),yfg(i),y(n3))
-            ar3=signa_single(x(n1),x(n2),xfg(i),y(n1),y(n2),yfg(i))
+            ar1=signa_single(xfg(i),real(x(n2)),real(x(n3)),yfg(i),real(y(n2)),real(y(n3)))  
+            ar2=signa_single(real(x(n1)),xfg(i),real(x(n3)),real(y(n1)),yfg(i),real(y(n3)))
+            ar3=signa_single(real(x(n1)),real(x(n2)),xfg(i),real(y(n1)),real(y(n2)),yfg(i))
             bb=abs(ar1)+abs(ar2)+abs(ar3)
-            aa=abs(signa_single(x(n1),x(n2),x(n3),y(n1),y(n2),y(n3)))
+            aa=abs(signa_single(real(x(n1)),real(x(n2)),real(x(n3)),real(y(n1)),real(y(n2)),real(y(n3))))
             rat=abs(bb-aa)/aa
             if(rat<ratmin(i)) then
               ratmin(i)=rat

diff --git a/src/Utility/Post-Processing-Fortran/read_output9_transect.f90 b/src/Utility/Post-Processing-Fortran/read_output9_transect.f90
@@ -201,7 +201,8 @@ program read_out
         do l=1,nxy
           if(iep(l)/=0) cycle
 
-          call pt_in_poly_single(i34(i),x(elnode(1:i34(i),i)),y(elnode(1:i34(i),i)),x00(l),y00(l),inside,arco(l,1:3),nodel)
+          call pt_in_poly_single(i34(i),real(x(elnode(1:i34(i),i))), &
+     &real(y(elnode(1:i34(i),i))),x00(l),y00(l),inside,arco(l,1:3),nodel)
           if(inside==1) then
             iep(l)=i
             !print*, 'Found:',l,arco(l,1:3),nodel

diff --git a/src/Utility/Post-Processing-Fortran/read_output9_xyt.f90 b/src/Utility/Post-Processing-Fortran/read_output9_xyt.f90
@@ -149,7 +149,8 @@ program read_out
         do l=1,nxy
           if(iep(l)/=0) cycle
 
-          call pt_in_poly_single(i34(i),x(elnode(1:i34(i),i)),y(elnode(1:i34(i),i)),x00(l),y00(l),inside,arco(l,1:3),nodel)
+          call pt_in_poly_single(i34(i),real(x(elnode(1:i34(i),i))), &
+     &real(y(elnode(1:i34(i),i))),x00(l),y00(l),inside,arco(l,1:3),nodel)
           if(inside==1) then
             iep(l)=i
             !print*, 'Found:',l,arco(l,1:3),nodel

diff --git a/src/Utility/Post-Processing-Fortran/read_output9_xyz.f90 b/src/Utility/Post-Processing-Fortran/read_output9_xyz.f90
@@ -171,7 +171,8 @@ program read_out
         do i=1,ne
           do l=1,nxy
             if(iep(l)/=0) cycle
-            call pt_in_poly_single(i34(i),x(elnode(1:i34(i),i)),y(elnode(1:i34(i),i)),x00(l),y00(l),inside,arco(l,1:3),nodel)
+            call pt_in_poly_single(i34(i),real(x(elnode(1:i34(i),i))), &
+     &real(y(elnode(1:i34(i),i))),x00(l),y00(l),inside,arco(l,1:3),nodel)
             if(inside==1) then
               iep(l)=i
               !print*, 'Found:',l,arco(l,1:3),nodel

diff --git a/src/Utility/Post-Processing-Fortran/read_output9_xyzt.f90 b/src/Utility/Post-Processing-Fortran/read_output9_xyzt.f90
@@ -128,7 +128,8 @@ program read_out
         do l=1,nxy
           if(iep(l)/=0) cycle
 
-          call pt_in_poly_single(i34(i),x(elnode(1:i34(i),i)),y(elnode(1:i34(i),i)),x00(l),y00(l),inside,arco(l,1:3),nodel)
+          call pt_in_poly_single(i34(i),real(x(elnode(1:i34(i),i))), &
+     &real(y(elnode(1:i34(i),i))),x00(l),y00(l),inside,arco(l,1:3),nodel)
           if(inside==1) then
             iep(l)=i
             !print*, 'Found:',l,arco(l,1:3),nodel

diff --git a/src/Utility/Post-Processing-Fortran/read_output9_xyzt_mpi.F90 b/src/Utility/Post-Processing-Fortran/read_output9_xyzt_mpi.F90
@@ -198,7 +198,8 @@ program read_out
         do i=1,nxy
           iglb=imap(i)
           do ie=1,ne
-            call pt_in_poly_single(i34(ie),x(elnode(1:i34(ie),ie)),y(elnode(1:i34(ie),ie)),x00(iglb),y00(iglb),inside,arco(i,1:3),nodel)
+            call pt_in_poly_single(i34(ie),real(x(elnode(1:i34(ie),ie))), &
+     &real(y(elnode(1:i34(ie),ie))),x00(iglb),y00(iglb),inside,arco(i,1:3),nodel)
             if(inside==1) then
               iep(i)=ie
               print*, 'Found:',i,arco(i,1:3),nodel