Commit ba819485 authored by Paola Bacigaluppi's avatar Paola Bacigaluppi
Browse files

Updated the Readme, The test 1D Sod problem with some files (run_tests) to run...

Updated the Readme, The test 1D Sod problem with some files (run_tests) to run the test on diverse mesh sizes by doing e.g ./run_tests Sod B1 from the B1 folder, and a python script to plot B1,B2,B3 on the diverse meshes and for different variables
parent f9d52e4d
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# FICHIER DE CREATION D'OBJETS ET D'UN EXECUTABLE
# RANGEMENT PAR ORDRE ALPHABETIQUE
#
# VERSION DEBBUGGEUR -db
# VERSION OPTIMISEUR
F90=gfortran
OBJDIR = obj1D
MODDIR = mod1D
BINDIR = bin1D
SRC = Src1D
FFLAGS = -DLINUX -J$(MODDIR) -cpp -c $(OPT) -ffree-line-length-none
LDFLAGS= -J$(MODDIR) -cpp $(OPT) -ffree-line-length-none
#INIT= init_bc_euler
#MODEL_VAR= variable_def_euler
#INIT= init_bc_wave_1D
#MODEL_VAR= variable_def_wave_1D
INIT= init_bc_scalar_1D
MODEL_VAR= variable_def_scalar_1D
OBJS = $(addprefix $(OBJDIR)/, elements_1D.o param2d.o $(MODEL_VAR).o aretes.o scheme.o overloading.o Model.o geometry.o algebra.o utils.o postprocessing.o timestepping.o $(INIT).o precision.o)
dec: $(MODDIR) $(OBJDIR) $(BINDIR) $(OBJS) $(SRC)/main_dec.f90
$(F90) $(LDFLAGS) -o $(BINDIR)/main_dec.out $(SRC)/main_dec.f90 $(OBJS)
$(MODDIR):
mkdir -p $(MODDIR)
$(OBJDIR):
mkdir -p $(OBJDIR)
$(BINDIR):
mkdir -p $(BINDIR)
$(OBJDIR)/Model.o: $(SRC)/Model.f90 $(OBJDIR)/utils.o $(OBJDIR)/param2d.o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/Model.o $(SRC)/Model.f90
$(OBJDIR)/aretes.o: $(SRC)/aretes.f90 $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/aretes.o $(SRC)/aretes.f90
$(OBJDIR)/overloading.o: $(SRC)/overloading.f90 $(OBJDIR)/$(MODEL_VAR).o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/overloading.o $(SRC)/overloading.f90
$(OBJDIR)/param2d.o: $(SRC)/param2d.f90 $(OBJDIR)/$(MODEL_VAR).o $(OBJDIR)/elements_1D.o $(OBJDIR)/aretes.o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/param2d.o $(SRC)/param2d.f90
$(OBJDIR)/geometry.o: $(SRC)/param2d.f90 $(OBJDIR)/elements_1D.o $(SRC)/geometry.f90 $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/geometry.o $(SRC)/geometry.f90
$(OBJDIR)/algebra.o: $(SRC)/algebra.f90 $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/algebra.o $(SRC)/algebra.f90
$(OBJDIR)/elements_1D.o: $(SRC)/elements_1D.f90 $(OBJDIR)/$(MODEL_VAR).o $(OBJDIR)/algebra.o $(OBJDIR)/overloading.o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/elements_1D.o $(SRC)/elements_1D.f90
$(OBJDIR)/$(MODEL_VAR).o: $(OBJDIR)/algebra.o $(SRC)/$(MODEL_VAR).f90 $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/$(MODEL_VAR).o $(SRC)/$(MODEL_VAR).f90
$(OBJDIR)/scheme.o: $(SRC)/scheme.f90 $(OBJDIR)/$(MODEL_VAR).o $(OBJDIR)/elements_1D.o $(OBJDIR)/overloading.o $(OBJDIR)/aretes.o $(OBJDIR)/Model.o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/scheme.o $(SRC)/scheme.f90
$(OBJDIR)/utils.o:$(SRC)/utils.f90 $(OBJDIR)/elements_1D.o $(OBJDIR)/$(MODEL_VAR).o $(OBJDIR)/$(INIT).o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/utils.o $(SRC)/utils.f90
$(OBJDIR)/$(INIT).o: $(SRC)/$(INIT).f90 $(OBJDIR)/param2d.o $(OBJDIR)/overloading.o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/$(INIT).o $(SRC)/$(INIT).f90
$(OBJDIR)/timestepping.o: $(SRC)/timestepping.f90 $(OBJDIR)/overloading.o $(OBJDIR)/elements_1D.o $(OBJDIR)/$(MODEL_VAR).o $(OBJDIR)/param2d.o $(OBJDIR)/scheme.o $(OBJDIR)/Model.o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/timestepping.o $(SRC)/timestepping.f90
$(OBJDIR)/postprocessing.o: $(SRC)/postprocessing.f90 $(OBJDIR)/param2d.o $(OBJDIR)/utils.o $(OBJDIR)/Model.o $(OBJDIR)/precision.o
$(F90) $(FFLAGS) -o $(OBJDIR)/postprocessing.o $(SRC)/postprocessing.f90
$(OBJDIR)/precision.o: $(SRC)/precision.f90
$(F90) $(FFLAGS) -o $(OBJDIR)/precision.o $(SRC)/precision.f90
clean:
rm -rf $(OBJDIR)
rm -rf $(MODDIR)
rm -rf $(BINDIR)
rm $(SRC)/*.f90~
rm *.mod
......@@ -66,4 +66,5 @@ Recombine Surface(surf4);
//Recombine Surface (surf3);
Physical Surface(0) = {surf1,surf2,surf3,surf4};
\ No newline at end of file
Physical Surface(0) = {surf1,surf2,surf3,surf4};
Mesh.MshFileVersion =2;
This diff is collapsed.
......@@ -19,14 +19,17 @@ Corresponding email: remi.abgrall@math.uzh.ch
**Warning**: works for Euler, the other models need to be checked.
### Compilation
Makefile in `Make/Makefile_2D.gfortran`. Uses `gfortran`
Please find the Makefile in Test1D and Test2D accordingly.
In 1D the file is called `Makefile_1D.gfortran`, while in 2D it is `Makefile 2D.gfortran`. To compile go in the Test1D or Test2D folder and type:
```
make -f Make//Makefile_2D.gfortran dec
make -f Make/Makefile_2D.gfortran dec
make -f Make/Makefile_2D.gfortran clean
```
Note:`LIBS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib` for mac
Note #1: The Makefile in Test# D uses gfortran. To compile with different settings, check the folder Make
on the main folder.
Note #2: `LIBS=-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib` for mac.
Note #3: According to the desired system set-up, uncomment/comment the required modules in the Makefile. The only modules to be changed are the `variable_def_*` and `init_bc *`.
### Meshes
How to generate compatible meshes with gmsh:
......
This is pdfTeX, Version 3.14159265-2.6-1.40.19 (TeX Live 2018) (preloaded format=pdflatex 2020.6.26) 19 MAR 2021 15:46
This is pdfTeX, Version 3.14159265-2.6-1.40.19 (TeX Live 2018) (preloaded format=pdflatex 2020.6.26) 25 MAR 2021 12:17
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
......@@ -35,69 +35,125 @@ Package: fullpage 1999/02/23 1.1 (PWD)
ty
\Urlmuskip=\muskip10
Package: url 2013/09/16 ver 3.4 Verb mode for urls, etc.
) (./ReadMe.aux)
)
(/usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/tex/latex/xcolor/xc
olor.sty
Package: xcolor 2016/05/11 v2.12 LaTeX color extensions (UK)
(/usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/tex/latex/graphics-
cfg/color.cfg
File: color.cfg 2016/01/02 v1.6 sample color configuration
)
Package xcolor Info: Driver file: pdftex.def on input line 225.
(/usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/tex/latex/graphics-
def/pdftex.def
File: pdftex.def 2018/01/08 v1.0l Graphics/color driver for pdftex
)
Package xcolor Info: Model `cmy' substituted by `cmy0' on input line 1348.
Package xcolor Info: Model `hsb' substituted by `rgb' on input line 1352.
Package xcolor Info: Model `RGB' extended on input line 1364.
Package xcolor Info: Model `HTML' substituted by `rgb' on input line 1366.
Package xcolor Info: Model `Hsb' substituted by `hsb' on input line 1367.
Package xcolor Info: Model `tHsb' substituted by `hsb' on input line 1368.
Package xcolor Info: Model `HSB' substituted by `hsb' on input line 1369.
Package xcolor Info: Model `Gray' substituted by `gray' on input line 1370.
Package xcolor Info: Model `wave' substituted by `hsb' on input line 1371.
(/usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/tex/latex/graphics/
dvipsnam.def
File: dvipsnam.def 2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)
)) (./ReadMe.aux)
\openout1 = `ReadMe.aux'.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 3.
LaTeX Font Info: ... okay on input line 3.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 3.
LaTeX Font Info: ... okay on input line 3.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 3.
LaTeX Font Info: ... okay on input line 3.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 3.
LaTeX Font Info: ... okay on input line 3.
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 3.
LaTeX Font Info: ... okay on input line 3.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 3.
LaTeX Font Info: ... okay on input line 3.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 5.
LaTeX Font Info: ... okay on input line 5.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 5.
LaTeX Font Info: ... okay on input line 5.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 5.
LaTeX Font Info: ... okay on input line 5.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 5.
LaTeX Font Info: ... okay on input line 5.
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 5.
LaTeX Font Info: ... okay on input line 5.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 5.
LaTeX Font Info: ... okay on input line 5.
(/usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/tex/context/base/mk
ii/supp-pdf.mkii
[Loading MPS to PDF converter (version 2006.09.02).]
\scratchcounter=\count88
\scratchdimen=\dimen103
\scratchbox=\box26
\nofMPsegments=\count89
\nofMParguments=\count90
\everyMPshowfont=\toks14
\MPscratchCnt=\count91
\MPscratchDim=\dimen104
\MPnumerator=\count92
\makeMPintoPDFobject=\count93
\everyMPtoPDFconversion=\toks15
)
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <12> on input line 9.
(Font) <12> on input line 11.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <8> on input line 9.
(Font) <8> on input line 11.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <6> on input line 9.
LaTeX Font Info: Try loading font information for OMS+cmr on input line 32.
(Font) <6> on input line 11.
Underfull \hbox (badness 10000) in paragraph at lines 15--17
[]
Underfull \hbox (badness 10000) in paragraph at lines 24--27
[]
LaTeX Font Info: Try loading font information for OMS+cmr on input line 36.
(/usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/tex/latex/base/omsc
mr.fd
File: omscmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions
)
LaTeX Font Info: Font shape `OMS/cmr/m/n' in size <10> not available
(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 32.
(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 36.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <7> on input line 32.
(Font) <7> on input line 36.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line 32.
(Font) <5> on input line 36.
[1
{/usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-var/fonts/map/pdftex/upd
map/pdftex.map}]
Overfull \hbox (7.85497pt too wide) in paragraph at lines 39--40
Overfull \hbox (7.85497pt too wide) in paragraph at lines 43--44
\OT1/cmr/m/n/10 ods in Ap-plied Math-e-mat-ics, v18(3), pp 327-350, 2018, doi:$
\OT1/cmtt/m/n/10 https : / / doi . org / 10 . 1515 / cmam-[]2017-[]0056$
[]
[2] (./ReadMe.aux) )
Here is how much of TeX's memory you used:
345 strings out of 492639
4380 string characters out of 6117887
64287 words of memory out of 5000000
4297 multiletter control sequences out of 15000+600000
7448 words of font info for 27 fonts, out of 8000000 for 9000
1349 strings out of 492639
17377 string characters out of 6117887
85015 words of memory out of 5000000
5279 multiletter control sequences out of 15000+600000
7756 words of font info for 28 fonts, out of 8000000 for 9000
1141 hyphenation exceptions out of 8191
23i,6n,19p,378b,263s stack positions out of 5000i,500n,10000p,200000b,80000s
23i,6n,35p,378b,264s stack positions out of 5000i,500n,10000p,200000b,80000s
</usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist
/fonts/type1/public/amsfonts/cm/cmbx12.pfb></usr/sepp1.5.1/drwho/pack-a/texlive
-20181114-cr/texmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb></usr/sepp1.5.
1/drwho/pack-a/texlive-20181114-cr/texmf-dist/fonts/type1/public/amsfonts/cm/cm
r12.pfb></usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/fonts/type1
/public/amsfonts/cm/cmr17.pfb></usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/
texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></usr/sepp1.5.1/drwho/pack
-a/texlive-20181114-cr/texmf-dist/fonts/type1/public/amsfonts/cm/cmtt10.pfb>
Output written on ReadMe.pdf (2 pages, 87432 bytes).
/fonts/type1/public/amsfonts/cm/cmbx10.pfb></usr/sepp1.5.1/drwho/pack-a/texlive
-20181114-cr/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb></usr/sepp1.5
.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/fonts/type1/public/amsfonts/cm/c
mr10.pfb></usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/fonts/type
1/public/amsfonts/cm/cmr12.pfb></usr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr
/texmf-dist/fonts/type1/public/amsfonts/cm/cmr17.pfb></usr/sepp1.5.1/drwho/pack
-a/texlive-20181114-cr/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></u
sr/sepp1.5.1/drwho/pack-a/texlive-20181114-cr/texmf-dist/fonts/type1/public/ams
fonts/cm/cmtt10.pfb>
Output written on ReadMe.pdf (2 pages, 98411 bytes).
PDF statistics:
35 PDF objects out of 1000 (max. 8388607)
24 compressed objects within 1 object stream
39 PDF objects out of 1000 (max. 8388607)
27 compressed objects within 1 object stream
0 named destinations out of 1000 (max. 500000)
1 words of extra memory for PDF output out of 10000 (max. 10000000)
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment