"worked on the 3d-representation of networks"

efirvida · Nov 19, 2023 · 89db754 · 89db754
1 parent b3999c0
commit 89db754
Show file tree

Hide file tree

Showing 10 changed files with 610 additions and 76 deletions.
diff --git a/doc/CalculiX.tex b/doc/CalculiX.tex
@@ -14481,8 +14481,8 @@ \subsubsection{Turbulent Flow in Open Channels \label{channels}}
 form:
 
 \begin{equation}
-z_1 + h_1 + \frac{\dot{m}^2}{2 \rho^2 A_1^2 g} = 
-z_2 + h_2 + \frac{\dot{m}^2}{2 \rho^2 A_2^2 g} + \Delta
+z_1 + h_1 \cos \varphi  + \frac{\dot{m}^2}{2 \rho^2 A_1^2 g} = 
+z_2 + h_2  \cos \varphi + \frac{\dot{m}^2}{2 \rho^2 A_2^2 g} + \Delta
 F.
 \end{equation} 
 
@@ -14494,7 +14494,7 @@ \subsubsection{Turbulent Flow in Open Channels \label{channels}}
 Defining the specific energy $E$ by:
 
 \begin{equation}
-  E := h +  \frac{Q^2}{2 A^2 g},
+  E := h  \cos \varphi +  \frac{Q^2}{2 A^2 g},
 \end{equation}
 
 one can write the above equation as $z_1 + E_1 = z_2 + E_2 + \Delta F$, from

diff --git a/src/CalculiX.c b/src/CalculiX.c
@@ -158,7 +158,7 @@ int main(int argc,char *argv[])
   printf("software, and you are welcome to redistribute it under\n");
   printf("certain conditions, see gpl.htm\n\n");
   printf("************************************************************\n\n");
-  printf("You are using an executable made on Sat Nov 11 17:01:27 CET 2023\n");
+  printf("You are using an executable made on Sun Nov 19 13:29:22 CET 2023\n");
   fflush(stdout);
 
   NNEW(ipoinp,ITG,2*nentries);

diff --git a/src/CalculiX.h b/src/CalculiX.h
@@ -1677,7 +1677,8 @@ void FORTRAN (flowoutput,(ITG *itg,ITG *ieg,ITG *ntg,ITG *nteq,
                           ITG *iendset,ITG *ialset,ITG *nset,ITG *mi,
                           ITG *iaxial,ITG *istep,ITG *iit,ITG *ipobody,
 			  ITG *ibody,double *xbodyact,ITG *nbody,ITG *ndata,
-			  double *sfr,double *sba,ITG *jumpup,ITG *jumpdo));
+			  double *sfr,double *sba,ITG *jumpup,ITG *jumpdo,
+			  double *hfr,double *hba));
 
 void FORTRAN(flowbc,(ITG *ntg,ITG *itg,double *cam,double *vold,
               double *v,

diff --git a/src/CalculiXstep.c b/src/CalculiXstep.c
@@ -301,7 +301,7 @@ void CalculiXstep(int argc,char argv[][133],ITG **nelemloadp,double **xloadp,
     printf("software, and you are welcome to redistribute it under\n");
     printf("certain conditions, see gpl.htm\n\n");
     printf("************************************************************\n\n");
-    printf("You are using an executable made on Sat Nov 11 17:01:27 CET 2023\n");
+    printf("You are using an executable made on Sun Nov 19 13:29:22 CET 2023\n");
     fflush(stdout);
 
     NNEW(ipoinp,ITG,2*nentries);

diff --git a/src/Makefile.inc b/src/Makefile.inc
@@ -342,6 +342,7 @@ forcadd.f \
 forcesolve.f \
 frdfluidfem.f \
 frditeration.f \
+frdnet.f \
 free_convection.f \
 free_disc_pumping.f \
 frequencys.f \

diff --git a/src/Makefile_i8 b/src/Makefile_i8
@@ -1,5 +1,5 @@
 
-CFLAGS = -Wall -O2 -fopenmp -fpic -I ../SPOOLES.2.2 -I$(PASTIX_INCLUDE) -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DINTSIZE64 -DPASTIX -DPASTIX_FP32 -DPASTIX_GPU
+CFLAGS = -Wall -O2 -fopenmp -fpic -I ../../SPOOLES.2.2 -I$(PASTIX_INCLUDE) -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DINTSIZE64 -DPASTIX -DPASTIX_FP32 -DPASTIX_GPU
 FFLAGS = -Wall -O2 -fopenmp -fpic -fdefault-integer-8
 
 CC=cc
@@ -18,20 +18,20 @@ OCCXF = $(SCCXF:.f=.o)
 OCCXC = $(SCCXC:.c=.o)
 OCCXMAIN = $(SCCXMAIN:.c=.o)
 
-DIR=../SPOOLES.2.2
+DIR=../../SPOOLES.2.2
 
-PASTIX_INCLUDE = ../PaStiX/pastix_i8/include
-PASTIX_LIBS = ../PaStiX/hwloc_i8/lib64/libhwloc.so ../OpenBLAS_i8/lib/libopenblas.a \
-  ../PaStiX/pastix_i8/lib/libpastix.a ../OpenBLAS_i8/lib/libopenblas.a -lpthread -lm ../PaStiX/pastix_i8/lib/libspm.a \
-  ../PaStiX/pastix_i8/lib/libpastix_parsec.a ../PaStiX/pastix_i8/lib/libpastix_kernels.a ../OpenBLAS_i8/lib/libopenblas.a -lrt \
-  ../PaStiX/pastix_i8/lib/libpastix_kernels_cuda.a ../PaStiX/parsec_i8/lib/libparsec.so \
+PASTIX_INCLUDE = ../../PaStiX/pastix_i8/include
+PASTIX_LIBS = ../../PaStiX/hwloc_i8/lib64/libhwloc.so ../../OpenBLAS_i8/lib/libopenblas.a \
+  ../../PaStiX/pastix_i8/lib/libpastix.a ../../OpenBLAS_i8/lib/libopenblas.a -lpthread -lm ../../PaStiX/pastix_i8/lib/libspm.a \
+  ../../PaStiX/pastix_i8/lib/libpastix_parsec.a ../../PaStiX/pastix_i8/lib/libpastix_kernels.a ../../OpenBLAS_i8/lib/libopenblas.a -lrt \
+  ../../PaStiX/pastix_i8/lib/libpastix_kernels_cuda.a ../../PaStiX/parsec_i8/lib/libparsec.so \
   /usr/local/cuda-10.2/lib64/libcudart_static.a -lpthread -ldl -lrt /usr/lib64/libcublas_static.a \
   /usr/local/cuda-10.2/lib64/libculibos.a /usr/lib64/libcublasLt_static.a -lrt \
-  ../PaStiX/scotch_i8/lib/libscotch.a ../PaStiX/scotch_i8/lib/libscotcherrexit.a -lpthread -lz -lm /usr/lib64/libstdc++.so.6 /usr/lib64/libgomp.so.1
+  ../../PaStiX/scotch_i8/lib/libscotch.a ../../PaStiX/scotch_i8/lib/libscotcherrexit.a -lpthread -lz -lm /usr/lib64/libstdc++.so.6 /usr/lib64/libgomp.so.1
 
 LIBS = \
      $(DIR)/spooles.a \
-     ../ARPACK_i8/libarpack_INTEL_i8.a \
+     ../../ARPACK_i8/libarpack_INTEL_i8.a \
      $(PASTIX_LIBS) \
      -lpthread -lm -lc