fixed merge

apps/arctic-20km/arctic20km.py

@@ -21,8 +21,8 @@
 # Choose a predefined ROMS-application:
 app='arctic-20km' # Arctic-20km
 
-start_date = datetime(1997,01,16,12)
-end_date   = datetime(1997,01,17,12)
+start_date = datetime(1997,01,17,00)
+end_date   = datetime(1997,02,16,00)
 
 
 a20params=Params(app,xcpu,ycpu,start_date,end_date,nrrec=-1,cicecpu=icecpu,restart=False)

apps/arctic-20km/include/arctic-20km.h

@@ -26,10 +26,10 @@
 
 #define UV_ADV             /* turn ON or OFF advection terms */
 #define UV_COR             /* turn ON or OFF Coriolis term */
-#undef  UV_VIS2            /* turn ON or OFF Laplacian horizontal mixing */
-#define UV_VIS4            /* turn ON or OFF biharmonic horizontal mixing */
+#define  UV_VIS2            /* turn ON or OFF Laplacian horizontal mixing */
+#undef  UV_VIS4            /* turn ON or OFF biharmonic horizontal mixing */
 #undef  UV_U3ADV_SPLIT     /* use 3rd-order upstream split momentum advection */
-#undef  UV_U3HADVECTION    /* define if 3rd-order upstream horiz. advection */
+#define  UV_U3HADVECTION    /* define if 3rd-order upstream horiz. advection */
 #undef  UV_SADVECTION      /* turn ON or OFF splines vertical advection */
 #undef  UV_C4HADVECTION    /* define if 4th-order centered horizontal advection */
 #define UV_QDRAG           /* turn ON or OFF quadratic bottom friction */
@@ -38,15 +38,16 @@
 #undef  VISC_GRID          /* viscosity coefficient scaled by grid size */
 #define NONLIN_EOS         /* define if using nonlinear equation of state */
 #undef  WJ_GRADP           /* Weighted density Jacobian (Song, 1998) */
-#define DJ_GRADPS          /* Splines density  Jacobian (Shchepetkin, 2000) */
+#define  DJ_GRADPS          /* Splines density  Jacobian (Shchepetkin, 2000) */
+#undef  PJ_GRADPQ4         /* quartic 4 Pressure Jacobian (Shchepetkin,2000) */
 #undef  DIFF_GRID          /* diffusion coefficient scaled by grid size */
 
 #define TS_DIF2            /* turn ON or OFF Laplacian horizontal mixing */
 #undef  TS_DIF4            /* turn ON or OFF biharmonic horizontal mixing */
 #undef  TS_U3ADV_SPLIT     /* use 3rd-order upstream split tracer advection */
 #undef  TS_U3HADVECTION    /* define if 3rd-order upstream horiz. advection */
 #define TS_A4HADVECTION    /* define if 4th-order Akima horiz. advection */
-#undef  TS_C4HADVECTION    /* define if 4th-order centered horizontal advection */
+#undef TS_C4HADVECTION    /* define if 4th-order centered horizontal advection */
 
 #undef  TS_MPDATA          /* define if recursive MPDATA 3D advection */
 
@@ -75,12 +76,15 @@
 #undef  STATIONS_CGRID     /* define if extracting data at native C-grid */
 
 #undef  BVF_MIXING         /* define if Brunt_Vaisala frequency mixing */
-#define LMD_MIXING         /* define if Large et al. (1994) interior closure */
+#define  LMD_MIXING         /* define if Large et al. (1994) interior closure */
 #undef  MY25_MIXING        /* define if Mellor/Yamada level-2.5 mixing */
 #undef  GLS_MIXING         /* Activate Generic Length-Scale mixing */
 
 #ifdef GLS_MIXING
 # define N2S2_HORAVG       /* Activate horizontal smoothing of buoyancy/shear */
+# undef KANTHA_CLAYSON    /* Value for CLS_CMU0 and CLS_C3M vary with choise of stability function */
+# define CANUTO_A           
+# undef CANUTO_B
 #endif
 #ifdef LMD_MIXING
 # define  LMD_BKPP          /* use if bottom boundary layer KPP mixing */

apps/build_roms.sh

@@ -72,6 +72,7 @@ export USE_OpenMP=
 export USE_LARGE=on
 
 export USE_DEBUG=
+
 export USE_NETCDF4=on
 
 export USE_CICE=on

apps/common/cice_input_grids/arctic-20km/ice_in.cice5.1.2

@@ -16,9 +16,9 @@
   , restart_dir    = '<cicedir>/rundir/restart/'
   , restart_file   = 'iced'
   , pointer_file   = '<cicedir>/rundir/restart/ice.restart_file'
-  , dumpfreq       = 'y'
-  , dumpfreq_n     = 1
-  , dump_last      = .true.
+  , dumpfreq       = 'd'
+  , dumpfreq_n     = 30
+  , dump_last      = .false.
   , bfbflag        = .false.
   , diagfreq       = 24
   , diag_type      = 'stdout'
@@ -93,7 +93,7 @@
 &dynamics_nml
     kdyn            = 1
   , ndte            = 120
-  , revised_evp     = .false.
+  , revised_evp     = .true.
   , advection       = 'remap'
   , kstrength       = 1
   , krdg_partic     = 1
@@ -152,19 +152,19 @@
 &forcing_nml
     formdrag        = .false.
   , atmbndy         = 'default'
-  , fyear_init      = 1997
+  , fyear_init      = 1993
   , ycycle          = 100
   , atm_data_format = 'nc'
-  , atm_data_type   = 'ecmwf'
-  , atm_data_dir    = './'
+  , atm_data_type   = 'metroms'
+  , atm_data_dir    = './atmcice/'
   , calc_strair     = .true.
   , highfreq        = .false.
   , natmiter        = 5
   , calc_Tsfc       = .true.
   , precip_units    = 'm_per_12hr'
   , ustar_min       = 0.0005
   , fbot_xfer_type  = 'constant'
-  , update_ocn_f    = .false.
+  , update_ocn_f    = .true.
   , l_mpond_fresh   = .false.
   , tfrz_option     = 'mushy'
   , oceanmixed_ice  = .false.