[cig-commits] r5267 - geodyn/3D/MoSST/trunk/mosst-dynamo
wei at geodynamics.org
wei at geodynamics.org
Tue Nov 14 16:29:17 PST 2006
Author: wei
Date: 2006-11-14 16:29:16 -0800 (Tue, 14 Nov 2006)
New Revision: 5267
Added:
geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10
Modified:
geodyn/3D/MoSST/trunk/mosst-dynamo/evolutions.f
geodyn/3D/MoSST/trunk/mosst-dynamo/make_modules
geodyn/3D/MoSST/trunk/mosst-dynamo/make_v10
geodyn/3D/MoSST/trunk/mosst-dynamo/mod_params.f
geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data
Log:
Modified run script
Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/evolutions.f
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/evolutions.f 2006-11-14 23:34:50 UTC (rev 5266)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/evolutions.f 2006-11-15 00:29:16 UTC (rev 5267)
@@ -305,7 +305,7 @@
dtmin = cflmin*cflno
dtmax = cflmax*cflno
if (deltt.lt.dtmin .or. deltt.gt.dtmax) then
-cts1 deltt = 0.5*(dtmin+dtmax)
+ deltt = 0.5*(dtmin+dtmax)
cts2 deltt = 0.25*(dtmin+dtmax)+0.5*deltt
itrung = 0
call vmatrixu
@@ -505,7 +505,7 @@
dtmin = cflmin*cflno
dtmax = cflmax*cflno
if (deltt.lt.dtmin .or. deltt.gt.dtmax) then
-cts1 deltt = 0.5*(dtmin+dtmax)
+ deltt = 0.5*(dtmin+dtmax)
cts2 deltt = 0.25*(dtmin+dtmax)+0.5*deltt
itrung = 2
call vmatrixu
@@ -863,7 +863,7 @@
dtmin = cflmin*cflno
dtmax = cflmax*cflno
if (deltt.lt.dtmin .or. deltt.gt.dtmax) then
-cts1 deltt = 0.5*(dtmin+dtmax)
+ deltt = 0.5*(dtmin+dtmax)
cts2 deltt = 0.25*(dtmin+dtmax)+0.5*deltt
nrunger= 1
call timeout(unit_time,tt)
Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/make_modules
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/make_modules 2006-11-14 23:34:50 UTC (rev 5266)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/make_modules 2006-11-15 00:29:16 UTC (rev 5267)
@@ -9,6 +9,6 @@
wq
EOF
-ifort -r8 -static -c mod_params.f mod_geoms.f mod_fields.f mod_artdis.f mod_anomaly.f mod_dataio.f mod_matrices.f -lintelsub90d -lblas -L$HOME/lib -L/usr/lib -nofor_main -O2
+ifort -r8 -static -c mod_params.f mod_geoms.f mod_fields.f mod_artdis.f mod_anomaly.f mod_dataio.f mod_matrices.f -lintelsub90d -lblas -L$HOME/mosst-svn/trunk/mosst-lib -L/usr/lib -nofor_main -O2
Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/make_v10
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/make_v10 2006-11-14 23:34:50 UTC (rev 5266)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/make_v10 2006-11-15 00:29:16 UTC (rev 5267)
@@ -4,5 +4,5 @@
EOF
-ifort -r8 -static -o mode10 mod_artdis.o mod_fields.o mod_matrices.o mod_anomaly.o mod_dataio.o mod_params.o mod_geoms.o mosst_cig.f evolutions.f params_io.f matrices.f miscs.f bcs.f solvers.f time_integ.f forces.f -lintelsub90d -lfftw3 -lblas -lm -L$HOME/lib -L/opt/fftw3.0.1/lib -L/usr/lib
+ifort -r8 -static -o mode10 mod_artdis.o mod_fields.o mod_matrices.o mod_anomaly.o mod_dataio.o mod_params.o mod_geoms.o mosst_cig.f evolutions.f params_io.f matrices.f miscs.f bcs.f solvers.f time_integ.f forces.f -lintelsub90d -lfftw3 -lblas -lm -L$HOME/mosst-svn/trunk/mosst-lib -L/usr/lib
Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/mod_params.f
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/mod_params.f 2006-11-14 23:34:50 UTC (rev 5266)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/mod_params.f 2006-11-15 00:29:16 UTC (rev 5267)
@@ -47,10 +47,10 @@
integer Lmax1,mmax1,nmxo1,nmxi1,nmxm1
integer nmx1,nmx2,nmx3,nmx4,nmx5,nmx6
integer Lmaxa,mmaxa,ntmax,npmax
- parameter (Lmax_v=15,mmax_v=10,miner=1)
- parameter (Lmax_m=15,mmax_m=10)
- parameter (Lmax_t=15,mmax_t=10)
- parameter (nmaxo=31,nmaxi=20,nmaxm=20)
+ parameter (Lmax_v=33,mmax_v=21,miner=2)
+ parameter (Lmax_m=33,mmax_m=21)
+ parameter (Lmax_t=33,mmax_t=21)
+ parameter (nmaxo=39,nmaxi=35,nmaxm=19)
parameter (Lmax=max0(Lmax_v,Lmax_m,Lmax_t))
parameter (mmax=max0(mmax_v,mmax_m,mmax_t))
parameter (Lmax1=Lmax+1,mmax1=mmax+1,nmxo1=nmaxo+1,
@@ -59,9 +59,9 @@
& nmx2=nmxo1*(Lmax_v*miner+Lmax_v-miner*(miner-1)/2),
& nmx3=2*nmxo1,nmx4=2*nmxi1,nmx5=2*nmxm1,
& nmx6=nmx3+nmx4+nmx5)
-cdia parameter (Lmaxa=3*Lmax/2,mmaxa=3*mmax/2)
-cdia parameter (ntmax=3*Lmax/2+1,npmax=3*mmax+1)
-cdiv parameter (nmax_v=2*(nmaxo-1)/3)
+ parameter (Lmaxa=3*Lmax/2,mmaxa=3*mmax/2)
+ parameter (ntmax=3*Lmax/2+1,npmax=3*mmax+1)
+ parameter (nmax_v=2*(nmaxo-1)/3)
cndi parameter (Lmaxa=Lmax+4,mmaxa=mmax+4)
cndi parameter (ntmax=Lmaxa+1,npmax=2*mmaxa+1)
cndv parameter (nmax_v=nmaxo)
Modified: geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data 2006-11-14 23:34:50 UTC (rev 5266)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/parameter.data 2006-11-15 00:29:16 UTC (rev 5267)
@@ -2,24 +2,24 @@
rcc=120
ricb=1200
rcmb=3500
- rdpp=3700
+ rdpp=3520
rear=6400
rhooc=10.0
rhoio=1.1
rhomo=0.4
etaio=1.0
- etado=200.0
+ etado=10.0
alpht=0.01
alphj=0.0
- ro=2.e-5
- ron=2.e-5
+ ro=1.25e-6
+ ron=1.25e-6
cm=1.0
- ekman=2.e-5
+ ekman=1.25e-6
rm=1.0
qk=1.0
rath=15000.0
- kicbv=2
- kcmbv=2
+ kicbv=0
+ kcmbv=0
kccbb=1
kicbb=2
kcmbb=2
@@ -36,33 +36,33 @@
avisv2=0.05
avisb=0.05
avist=0.05
- navfb=2
- navft=2
+ navfb=0
+ navft=0
navfv1=0
- navfv2=25
- deltt=0.1e-05
+ navfv2=0
+ deltt=0.4425891e-6
tt0=0.0
toutf=0.001
toutd=0.0001
- ntt=200000
+ ntt=500
nevol=0
ncfl=1
- cflmin=0.8
+ cflmin=0.7
cflmax=1.1
- usr_name="kuang"
+ usr_name="wei/mosst-svn/trunk"
code_geom="sphere"
- disc_in="sea10"
- subdir_in="data"
- version_in="fini01"
+ disc_in="home"
+ subdir_in="mosst-data"
+ version_in="fftw_v10"
fileno_in=1000
- disc_out="sea10"
- subdir_out="data"
- version_out="fini01"
- fileno_out=1000
- disc_diag="sea10"
+ disc_out="home"
+ subdir_out="mosst-data"
+ version_out="fftw_v10"
+ fileno_out=1001
+ disc_diag="home"
subdir_diag="data"
- version_diag="fini01"
- disc_anom="sea10"
+ version_diag="fftw_v10"
+ disc_anom="home"
subdir_anom="data"
version_anom="anomaly_data"
$
Added: geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10
===================================================================
--- geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10 2006-11-14 23:34:50 UTC (rev 5266)
+++ geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10 2006-11-15 00:29:16 UTC (rev 5267)
@@ -0,0 +1,63 @@
+#/bin/rm parameter.data
+
+#cp $HOME/research/src/model/params_v10.data parameter.data
+
+ex parameter.data << EOF
+1,\$s/ellpm=3.274e-3/ellpm=3.274e-3/
+1,\$s/rdpp=3700/rdpp=3520/
+1,\$s/etado=200.0/etado=10.0/
+1,\$s/scale_mdens=1.0/scale_mdens=1.0/
+1,\$s/epstp=0.0/epstp=0.0/
+1,\$s/altpnh=0.0/altpnh=0.5/
+1,\$s/ro=2.e-5/ro=1.25e-6/
+1,\$s/ron=2.e-5/ron=1.25e-6/
+1,\$s/ekman=2.e-5/ekman=1.25e-6/
+1,\$s/rath=15000.0/rath=15000.0/
+1,\$s/kicbv=2/kicbv=0/
+1,\$s/kcmbv=2/kcmbv=0/
+1,\$s/kccbb=1/kccbb=1/
+1,\$s/kicbb=2/kicbb=2/
+1,\$s/kcmbb=2/kcmbb=2/
+1,\$s/kicbt=1/kicbt=1/
+1,\$s/kcmbt=1/kcmbt=1/
+1,\$s/k_icrot=2/k_icrot=2/
+1,\$s/itvcmb=1/itvcmb=1/
+1,\$s/itucmb=1/itucmb=1/
+1,\$s/itbcmb=1/itbcmb=1/
+1,\$s/itjcmb=1/itjcmb=1/
+1,\$s/ittcmb=1/ittcmb=1/
+1,\$s/indxt=0/indxt=0/
+1,\$s/nevol=0/nevol=0/
+1,\$s/ncfl=1/ncfl=1/
+1,\$s/cflmin=0.8/cflmin=0.7
+1,\$s/cflmax=1.1/cflmax=1.1
+1,\$s/avisv1=0.05/avisv1=0.05/
+1,\$s/avisv2=0.05/avisv2=0.05/
+1,\$s/avisb=0.05/avisb=0.05/
+1,\$s/avist=0.05/avist=0.05/
+1,\$s/navfb=2/navfb=0/
+1,\$s/navft=2/navft=0/
+1,\$s/navfv1=0/navfv1=0/
+1,\$s/navfv2=25/navfv2=0/
+1,\$s/deltt=0.1e-05/deltt=0.4425891e-6/
+1,\$s/tt0=0.0/tt0=0.0/
+1,\$s/toutf=0.001/toutf=0.001/
+1,\$s/toutd=0.0001/toutd=0.0001/
+1,\$s/ntt=200000/ntt=500/
+1,\$s/fileno_in=1000/fileno_in=1000/
+1,\$s/fileno_out=1000/fileno_out=1001/
+1,\$s/disc_in="sea10"/disc_in="home"/
+1,\$s/disc_out="sea10"/disc_out="home"/
+1,\$s/disc_diag="sea10"/disc_diag="home"/
+1,\$s/disc_anom="sea10"/disc_anom="home"/
+1,\$s/version_in="fini01"/version_in="fftw_v10"/
+1,\$s/version_out="fini01"/version_out="fftw_v10"/
+1,\$s/version_diag="fini01"/version_diag="fftw_v10"/
+1,\$s/k_mdens=0/k_mdens=0/
+1,\$s/k_cmbheat=0/k_cmbheat=0/
+1,\$s/k_cmbtopo=0/k_cmbtopo=0/
+wq
+EOF
+
+#substitute your local MoSST path in the following line
+$HOME/mosst-dir/mosst-dynamo/mode10 &
Property changes on: geodyn/3D/MoSST/trunk/mosst-dynamo/run_v10
___________________________________________________________________
Name: svn:executable
+ *
More information about the cig-commits
mailing list