Commit aff9e448 authored by Olivier Bonnefon's avatar Olivier Bonnefon
Browse files

add departements

parent de09b0dc
......@@ -75,11 +75,12 @@ string OUTPUTDIR=BASEREP;
int nbCallSave=0;
for (CURYEAR=FIRSTYEAR; CURYEAR<=LASTYEAR; CURYEAR++){
for ( curStep=0;curStep<nbSteps;curStep++){
if (u0size <= (nbCallSave+1)*utm12d0.n){
//check over date
if (u0size < (nbCallSave+1)*utm12d0.n){
cout<<CURYEAR<<" "<<curStep<<": u0size="<<u0size<<" "<<(nbCallSave+1)*utm12d0.n<<endl;;
continue;
}
if (curStep > 212 ){
if (curStep > 100 ){
utm12d0[]=u0(nbCallSave*utm12d0.n:(nbCallSave+1)*utm12d0.n);
utm12d1[]=u1(nbCallSave*utm12d1.n:(nbCallSave+1)*utm12d1.n);
utm12d2[]=u2(nbCallSave*utm12d2.n:(nbCallSave+1)*utm12d2.n);
......@@ -95,13 +96,13 @@ string OUTPUTDIR=BASEREP;
utm12d12[]=u12(nbCallSave*utm12d12.n:(nbCallSave+1)*utm12d12.n);
utm12d13[]=u13(nbCallSave*utm12d13.n:(nbCallSave+1)*utm12d13.n);
utm12d14[]=u14(nbCallSave*utm12d14.n:(nbCallSave+1)*utm12d14.n);
bool waitt=false;
bool waitt=true;
//if (curStep%15)
// waitt=false;
plot(utm12d0,utm12d1,utm12d2,utm12d3,utm12d4,utm12d5,utm12d6,utm12d7,utm12d8,utm12d9,utm12d10,utm12d11,utm12d12,utm12d13,utm12d14,
if (curStep%15==0)
plot(utm12d0,utm12d1,utm12d2,utm12d3,utm12d4,utm12d5,utm12d6,utm12d7,utm12d8,utm12d9,utm12d10,utm12d11,utm12d12,utm12d13,utm12d14,
cmm="rep "+string(numRun)+" year="+string(CURYEAR)+" step="+string(curStep),value=true,fill=true,wait=waitt);
include "saveVtk.edp";
//include "saveVtk.edp";
}
nbCallSave++;
}
......
......@@ -123,4 +123,4 @@ matrix M1=[
];
matrix M;
OBtestCSR(M1,M,I1I2,NbSpecies);
set(M,solver=GMRES);
set(M,solver=UMFPACK);
......@@ -48,6 +48,7 @@ real mupowm1=0;
int freqVtk=100000;
real Tw=1.0;
real Rstar=0.14*365.0;
real timeScal=365;
string GDDTHRESHOLD="GDD_269/";
if (scenario==scenarioLow){
Rstar=0.12*365;
......@@ -64,7 +65,7 @@ if (scenario==scenarioHight){
real K=1.0;
//real Ru2=(Rstar-deathrate)/K;
real maxGt=0.11*365.0;
real Ru2=maxGt - deathrate;
real Ru2=maxGt + deathrate;
include "defOutputGen.edp";
real[int] u6(6);
//real[int] grad6(6);
......
......@@ -36,3 +36,4 @@ if (FIRSTYEAR==2011){
w0stm12d14=w0s2d14;
}
plot(w0s2d0,w0s2d1,w0s2d2,w0s2d3,w0s2d4,w0s2d5,w0s2d6,w0s2d7,w0s2d8,w0s2d9,w0s2d10,w0s2d11,w0s2d12,w0s2d13,w0s2d14,cmm="w0 in defIC",value=true,fill=true,wait=true);
\ No newline at end of file
string OUTPUTDIR="/mnt/bigcalcul2/biom/olivierB/solvers/trunk/SandBox/FF/AEDESINTER_AUTOROUTES/";
string OUTPUTDIR="/home/biometrie/obonnefon/aedes/AEDESINTER_AUTOROUTES/";
{ofstream pTmp(OUTPUTDIR+"Surfaces.txt");
pTmp<<"Surf0="<<Surf0<<endl;
pTmp<<"Surf1="<<Surf1<<endl;
......
......@@ -2537,4 +2537,4 @@ matrix Maux2;
//END VARFS
include "/mnt/bigcalcul2/biom/olivierB/solvers/trunk/SandBox/FF/AEDESINTER_AUTOROUTES/updateMatrix1D.edp";
include "updateMatrix1D.edp";
This diff is collapsed.
int FIRSTYEAR=2017;
int LASTYEAR=2017;
//int LASTYEAR=2017;
int LASTYEAR=2019;
int CURYEAR=2017;
int CURYEARRAND;
......@@ -10,7 +11,7 @@ int CURYEARRAND;
//unite de temps : annee
//unite d'espace : metre
real dt=1.0/365.0;
real dt=1/365.0;
//nb pas de temps par an
int nbSteps= 1.0/dt;
int nbStepsByYear= 1.0/dt;
......
......@@ -99,39 +99,43 @@ if (numDay > 59){
LoadVec(GT14[],DATASAFRAN +"GT_BY_DAY/"+string(CURYEAR)+"/mesh14s"+string(numDay));
//update R
RR0=GT0*GP0;
RR1=GT1*GP1;
RR2=GT2*GP2;
RR3=GT3*GP3;
RR4=GT4*GP4;
RR5=GT5*GP5;
RR6=GT6*GP6;
RR7=GT7*GP7;
RR8=GT8*GP8;
RR9=GT9*GP9;
RR10=GT10*GP10;
RR11=GT11*GP11;
RR12=GT12*GP12;
RR13=GT13*GP13;
RR14=GT14*GP14;
//if (numDay%10==0)
// plot(RR0,RR1,RR2,RR3,RR4,RR5,RR6,RR7,RR8,RR9,RR10,RR11,RR12,RR13,RR14,cmm="rr "+string(numDay),value=true,fill=true,wait=true);
RR0=timeScal*GT0*GP0;
RR1=timeScal*GT1*GP1;
RR2=timeScal*GT2*GP2;
RR3=timeScal*GT3*GP3;
RR4=timeScal*GT4*GP4;
RR5=timeScal*GT5*GP5;
RR6=timeScal*GT6*GP6;
RR7=timeScal*GT7*GP7;
RR8=timeScal*GT8*GP8;
RR9=timeScal*GT9*GP9;
RR10=timeScal*GT10*GP10;
RR11=timeScal*GT11*GP11;
RR12=timeScal*GT12*GP12;
RR13=timeScal*GT13*GP13;
RR14=timeScal*GT14*GP14;
if (numDay%10==0 && numDay > 200)
plot(RR0,RR1,RR2,RR3,RR4,RR5,RR6,RR7,RR8,RR9,RR10,RR11,RR12,RR13,RR14,cmm="rr "+string(numDay),value=true,fill=true,wait=true);
//update gammaw1s1
gammaw1s0=GT0*(1-GP0);
gammaw1s1=GT1*(1-GP1);
gammaw1s2=GT2*(1-GP2);
gammaw1s3=GT3*(1-GP3);
gammaw1s4=GT4*(1-GP4);
gammaw1s5=GT5*(1-GP5);
gammaw1s6=GT6*(1-GP6);
gammaw1s7=GT7*(1-GP7);
gammaw1s8=GT8*(1-GP8);
gammaw1s9=GT9*(1-GP9);
gammaw1s10=GT10*(1-GP10);
gammaw1s11=GT11*(1-GP11);
gammaw1s12=GT12*(1-GP12);
gammaw1s13=GT13*(1-GP13);
gammaw1s14=GT14*(1-GP14);
gammaw1s0=timeScal*GT0*(1-GP0);
gammaw1s1=timeScal*GT1*(1-GP1);
gammaw1s2=timeScal*GT2*(1-GP2);
gammaw1s3=timeScal*GT3*(1-GP3);
gammaw1s4=timeScal*GT4*(1-GP4);
gammaw1s5=timeScal*GT5*(1-GP5);
gammaw1s6=timeScal*GT6*(1-GP6);
gammaw1s7=timeScal*GT7*(1-GP7);
gammaw1s8=timeScal*GT8*(1-GP8);
gammaw1s9=timeScal*GT9*(1-GP9);
gammaw1s10=timeScal*GT10*(1-GP10);
gammaw1s11=timeScal*GT11*(1-GP11);
gammaw1s12=timeScal*GT12*(1-GP12);
gammaw1s13=timeScal*GT13*(1-GP13);
gammaw1s14=timeScal*GT14*(1-GP14);
if (numDay%10==0 && numDay > 200){
plot(gammaw1s0,gammaw1s1,gammaw1s2,gammaw1s3,gammaw1s4,gammaw1s5,gammaw1s6,gammaw1s7,gammaw1s8,gammaw1s9,gammaw1s10,gammaw1s11,gammaw1s12,gammaw1s13,gammaw1s14,cmm="gamma "+string(numDay),value=true,fill=true,wait=true);
plot(w1s2d0,w1s2d1,w1s2d2,w1s2d3,w1s2d4,w1s2d5,w1s2d6,w1s2d7,w1s2d8,w1s2d9,w1s2d10,w1s2d11,w1s2d12,w1s2d13,w1s2d14,cmm="w1s "+ string(numDay),value=true,fill=true,wait=false);
}
CURYEAR=CURYEARSAV;
......@@ -3,4 +3,4 @@
#$ -N Ae1
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 0
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 9 1
......@@ -3,4 +3,4 @@
#$ -N Ae10
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 90
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 99 1
......@@ -3,4 +3,4 @@
#$ -N Ae2
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 10
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 19 1
......@@ -3,4 +3,4 @@
#$ -N Ae3
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 20
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 28 2
......@@ -3,4 +3,4 @@
#$ -N Ae4
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 30
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 39 1
......@@ -3,4 +3,4 @@
#$ -N Ae5
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 40
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 47 3
......@@ -3,4 +3,4 @@
#$ -N Ae6
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 50
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 58 2
......@@ -3,4 +3,4 @@
#$ -N Ae9
#$ -V
#$ -cwd
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 80
/opt/freefem++-3.58/src/nw/FreeFem++-nw cas1.edp 89 1
......@@ -33,3 +33,4 @@ if (!nbCallSave){
SaveVecAppend(utm12d14[],"SAVE/u2d14_"+"_rep_"+string(numRun));
}
nbCallSave++;
plot(utm12d0,utm12d1,utm12d2,utm12d3,utm12d4,utm12d5,utm12d6,utm12d7,utm12d8,utm12d9,utm12d10,utm12d11,utm12d12,utm12d13,utm12d14, cmm="rep "+string(numRun)+" year="+string(CURYEAR)+" step="+string(curStep),value=true,fill=true,wait=false);
......@@ -30,3 +30,6 @@ SaveVec(w0s2d12[],"SAVE/w0s2d12_"+string(CURYEAR));
SaveVec(w0s2d13[],"SAVE/w0s2d13_"+string(CURYEAR));
SaveVec(w0s2d14[],"SAVE/w0s2d14_"+string(CURYEAR));
plot(w1s2d0,w1s2d1,w1s2d2,w1s2d3,w1s2d4,w1s2d5,w1s2d6,w1s2d7,w1s2d8,w1s2d9,w1s2d10,w1s2d11,w1s2d12,w1s2d13,w1s2d14,cmm="w1 saved",value=true,fill=true,wait=true);
plot(w0s2d0,w0s2d1,w0s2d2,w0s2d3,w0s2d4,w0s2d5,w0s2d6,w0s2d7,w0s2d8,w0s2d9,w0s2d10,w0s2d11,w0s2d12,w0s2d13,w0s2d14,cmm="w0 saved",value=true,fill=true,wait=true);
\ No newline at end of file
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