Changeset 943

Timestamp:

07/05/19 16:43:15 (5 years ago)

Author:

dubos

Message:

devel/Python : fix baroclinic test case

Location:

codes/icosagcm/devel/Python/test

Files:

• jobs/camelot.pbs (modified) (2 diffs)
• py/Baroclinic_3D_ullrich.py (modified) (1 diff)

codes/icosagcm/devel/Python/test/jobs/camelot.pbs

@@ -3 +3 @@
 #PBS -q std
 #PBS -l nodes=1:ppn=64
-#PBS -l walltime=05:00:00
+#PBS -l walltime=00:15:00
 #PBS -V
 #PBS -l mem=60gb,vmem=60gb
@@ -44 +44 @@
     rm -f output_dynamico_native.nc xios_client* 
     ./python.sh serial py/write_Cartesian_mesh.py --nx=$NX --ny=$NY --Lx=$NX --Ly=$NY
-    ./python.sh mpi $((NI*NJ)) py/Baroclinic_3D_ullrich.py --mpi_ni $NI --mpi_nj $NJ --T 3600 --N 360 --ny $NY --nx $NX --dt $DT --Davies_N1 $NDAVIES --Davies_N2 $NDAVIES
+    ./python.sh mpi $((NI*NJ)) py/Baroclinic_3D_ullrich.py --mpi_ni $NI --mpi_nj $NJ --T 3600 --N 360 --ny $NY --nx $NX --dt $DT --Davies_N1 $NDAVIES --Davies_N2 $NDAVIES --kappa_divgrad 0. --kappa_curlcurl 0.
 }
 
 
 #run 400 84 6 300. # high-res
-run 200 42 3 300. >gcm.log # low-res
+run 200 42 3 600. >gcm.log # low-res
 
 # ./python.sh mpi $((NI*NJ)) py/Baroclinic_3D_ullrich.py --mpi_ni $NI --mpi_nj $NJ --T 3600 --N 360 --ny 84 --nx 400 --dt 300. --Davies_N1 6 --Davies_N2 6

codes/icosagcm/devel/Python/test/py/Baroclinic_3D_ullrich.py

@@ -87 +87 @@
         A = A + exp(-(((x-xc-Lx)**2+(y-yc)**2)/lp**2))
         A = A + exp(-(((x-xc+Lx)**2+(y-yc)**2)/lp**2))
-        return  u*A
+        return  u + up*A
 
     def tmean(eta) : return T0*eta**(Rd*lap/g)