--- trunk/Sources/test_inter_barxy.f	2015/04/29 15:47:56	134
+++ trunk/dyn3d/Inter_barxy/test_inter_barxy.f	2018/07/12 14:49:20	276
@@ -1,10 +1,14 @@
 program test_inter_barxy
 
-  use comconst, only: dtvr, daysec, iniconst
-  use comgeom, only: rlonu, rlatv, inigeom
-  use conf_gcm_m, only: conf_gcm, day_step
-  use dimens_m, only: iim, jjm
-  use disvert_m, only: pa
+  use comconst, only: iniconst
+  use comdissnew, only: read_comdissnew
+  use comgeom, only: inigeom
+  use conf_gcm_m, only: conf_gcm
+  use dimensions, only: iim, jjm
+  USE dynetat0_m, only: rlonu, rlatv, rlatu, rlatu1, rlatu2, rlonv, xprimm025, &
+       xprimp025, xprimu, xprimv, yprimu1, yprimu2, read_serre
+  use fxhyp_m, only: fxhyp
+  use fyhyp_m, only: fyhyp
   use inter_barxy_m, only: inter_barxy
   USE nr_util, ONLY : pi
 
@@ -30,10 +34,15 @@
   allocate(var_ana3d(iml_dyn, jml_dyn))
 
   CALL conf_gcm
-  dtvr = daysec / real(day_step)
-  print *, 'dtvr = ', dtvr
-  pa = 5e4
+  call read_comdissnew
   CALL iniconst
+  call read_serre
+  CALL fyhyp(rlatu, rlatv, rlatu2, yprimu2, rlatu1, yprimu1)
+  CALL fxhyp(xprimm025, rlonv, xprimv, rlonu, xprimu, xprimp025)
+
+  rlatu(1) = pi / 2.
+  rlatu(jjm + 1) = -rlatu(1)
+
   CALL inigeom
 
   lon_ini = - pi + 2 * pi / iml_dyn * (/(i, i = 0, iml_dyn - 1)/)