Index: mc2nml.cdk =================================================================== --- mc2nml.cdk 2004-09-24 20:46:06.000000000 +0100 +++ mc2nml.cdk 2004-09-28 16:51:00.000000000 +0100 @@ -75,7 +75,7 @@ copyright (C) 2001 MSC-RPN COMM %%%MC2 $ gnk,nktop,htop,gnnpbl,zt,v_interp, $ gcrunstrt,Pil_nesdt,hblen_x,hblen_y, $ Grdc_ni,Grdc_nj,Grdc_iref,Grdc_jref,no_coriol,no_msf, - $ Grdc_latr,Grdc_lonr,Grdc_dx,Grdc_nsor,Grdc_nfe, + $ fst_casc,Grdc_latr,Grdc_lonr,Grdc_dx,Grdc_nsor,Grdc_nfe, $ Grdc_dgrw,Grdc_phir,Grdc_proj_S,Grdc_trnm_S, $ Grdc_xlat1,Grdc_xlon1,Grdc_xlat2,Grdc_xlon2,Grdc_nbits, $ Grdc_runstrt_S,Grdc_bcs_L,Grdc_Hblen_x,Grdc_Hblen_y Index: out_dyn.ftn =================================================================== --- out_dyn.ftn 2004-09-24 20:46:06.000000000 +0100 +++ out_dyn.ftn 2004-09-28 16:59:42.000000000 +0100 @@ -54,6 +54,9 @@ copyright (C) 2001 MSC-RPN COMM %%%MC2 * if (rstrt.and..not.doneonce) goto 998 * +*** Set cascade output style + if (fst_casc) oldstyle = .true. +* *########## REGULAR OUTPUT ####################################### * do 100 i=1,nkout Index: out_phy.ftn =================================================================== --- out_phy.ftn 2004-09-24 20:46:06.000000000 +0100 +++ out_phy.ftn 2004-09-28 16:52:08.000000000 +0100 @@ -60,6 +60,7 @@ copyright (C) 2001 MSC-RPN COMM %%%MC2 ** integer i,j,k,osetn,level_id,grid_id,ngth,gthid(bus_otop),nk_o integer, dimension (:), allocatable :: ind_o + character*1 outputFormat *---------------------------------------------------------------------- * *########## REGULAR OUTPUT ####################################### @@ -152,9 +153,14 @@ copyright (C) 2001 MSC-RPN COMM %%%MC2 print*, (bus_oname(gthid(j),2),j=1,ngth) endif * + if (fst_casc) then + outputFormat = 'A' + else + outputFormat = 'C' + endif call out_phyr ( bus_o,gthid,ngth,fni,fnj,doni,donj, - $ ni,nj,stepno,ind_o,nk_o,Grdc_nsor,'C' ) -c $ ni,nj,stepno,ind_o,nk_o,Grdc_nsor,'A' ) + $ ni,nj,stepno,ind_o,nk_o,Grdc_nsor, + $ outputFormat ) endif deallocate (ind_o) out_ontimec = .false. Index: mc2ctrl.ftn =================================================================== --- mc2ctrl.ftn 2004-09-24 20:46:06.000000000 +0100 +++ mc2ctrl.ftn 2004-09-28 16:50:42.000000000 +0100 @@ -88,6 +88,7 @@ cccccccccccccccccccccccccccccccccccccccc nofcms = .false. ! coriolis and map scale active no_coriol = .false. ! coriolis active no_msf = .false. ! map scale active + fst_casc = .false. ! new cascade file format (F-binaries only) flipit = .false. glconta = .false. glcpld = .false. Index: grd.cdk =================================================================== --- grd.cdk 2004-09-24 20:46:06.000000000 +0100 +++ grd.cdk 2004-09-28 16:49:30.000000000 +0100 @@ -38,7 +38,7 @@ copyright (C) 2001 MSC-RPN COMM %%%MC2 $ Grd_xlat1,Grd_xlon1,Grd_xlat2,Grd_xlon2,endgrdr common /gril_c/ Grd_proj_S,endgrdc * - logical Grdc_bcs_L,Grdc_init3d_L,Grdc_initsfc_L + logical Grdc_bcs_L,Grdc_init3d_L,Grdc_initsfc_L,fst_casc integer Grdc_ni,Grdc_nj,Grdc_iref,Grdc_jref,Grdc_id, $ Grdc_gid,Grdc_gif,Grdc_gjd,Grdc_gjf,Grdc_ndt, $ Grdc_nsor,Grd_ig1c,Grd_ig2c,Grd_ig3c,Grd_ig4c, @@ -58,7 +58,7 @@ copyright (C) 2001 MSC-RPN COMM %%%MC2 $ Grdc_nsor,Grd_ig1c,Grd_ig2c,Grd_ig3c,Grd_ig4c, $ Grdc_Hblen_x,Grdc_Hblen_y,Grdc_hbwe,Grdc_hbsn, $ Grdc_start,Grdc_bcs_L,Grdc_init3d_L, - $ Grdc_initsfc_L,Grdc_nbits,endGrdci + $ Grdc_initsfc_L,Grdc_nbits,endGrdci,fst_casc common /gril2_r/ Grdc_latr,Grdc_lonr,Grdc_dx,Grdc_dgrw,Grdc_phir, $ Grdc_xlat1,Grdc_xlon1,Grdc_xlat2,Grdc_xlon2, $ endGrdcr