Sfoglia il codice sorgente

second update elasticities

mkilani 3 anni fa
parent
commit
93b32d4c53
3 ha cambiato i file con 12 aggiunte e 0 eliminazioni
  1. 5 0
      scbd.dat
  2. 6 0
      src/param.f
  3. 1 0
      src/param.inc

+ 5 - 0
scbd.dat

@@ -44,6 +44,11 @@ Nsc=110.465
 Nce=110.465
 Nse=118.155
 
+# (* Elasticités des demandes *)
+MUsc=0.2
+MUce=0.2
+MUse=0.2
+
 #(* EXTERNAL COST *)
 
 #in public transit (crowding)

+ 6 - 0
src/param.f

@@ -76,6 +76,12 @@ C     double precision var,varvalue
         POPCE=varvalue
       elseif(varname.eq."Nse") then
         POPSE=varvalue
+      elseif(varname.eq."MUsc") then
+        MUSC=varvalue
+      elseif(varname.eq."MUce") then
+        MUCE=varvalue
+      elseif(varname.eq."MUse") then
+        MUSE=varvalue
       elseif(varname.eq."asct") then
         asct=varvalue
       elseif(varname.eq."acet") then

+ 1 - 0
src/param.inc

@@ -8,6 +8,7 @@ C this file contains block parameters in the model
 C     COMMON /PRFARES/ PSC,PCE,PSE,TAUSC,TAUCE,TAUSE
 C     COMMON /FREQ/ FSC,FCE,FSE,AA,BB
       COMMON /POP/  POPSC,POPCE,POPSE
+      COMMON /ELAS/ MUSC, MUCE, MUSE
       COMMON /EXTCOST/ ASCT,ACET,ASET,ASCR,ACER,ASER 
       COMMON /OTHER/ CW,PHI,SC,GAMA,EF,VAL,THETA
 C B is the coefficient in the effort function b aa^2