<p><b>dwj07@fsu.edu</b> 2013-02-13 11:29:41 -0700 (Wed, 13 Feb 2013)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Update baroclinic_channel makeMeshes.sh script to generate correct namelist.input files for the current trunk of the ocean core.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/baroclinic_channel/makeMeshes.sh
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/baroclinic_channel/makeMeshes.sh        2013-02-13 18:05:36 UTC (rev 2471)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/baroclinic_channel/makeMeshes.sh        2013-02-13 18:29:41 UTC (rev 2472)
@@ -34,7 +34,7 @@
#######################################################
## Setup Variables for different run initializations ##
#######################################################
-TIME_STEPPERS["config_time_integration"]="rk4"
+TIME_STEPPERS["config_time_integrator"]="rk4"
TIME_STEPS["config_dt"]="40"
DEFAULT_TIME_INTEGRATOR="'split_explicit'"
@@ -51,7 +51,8 @@
KEYS[$i]="config_restart_name"; VALUES[$i]="'restart.nc'"; i=$i+1;
KEYS[$i]="config_output_interval"; VALUES[$i]="'01_00:00:00'"; i=$i+1;
KEYS[$i]="config_do_restart"; VALUES[$i]=".false."; i=$i+1;
-KEYS[$i]="config_vert_grid_type"; VALUES[$i]="'zstar'"; i=$i+1;
+KEYS[$i]="config_vert_coord_movement"; VALUES[$i]="'uniform_stretching'"; i=$i+1;
+KEYS[$i]="config_alter_ICs_for_pbcs"; VALUES[$i]="'zlevel_pbcs_off'"; i=$i+1;
KEYS[$i]="config_rho0"; VALUES[$i]="1000"; i=$i+1;
KEYS[$i]="config_bottom_drag_coeff"; VALUES[$i]="1.0e-2"; i=$i+1;
KEYS[$i]="config_vert_visc_type"; VALUES[$i]="'const'"; i=$i+1;
@@ -60,7 +61,6 @@
KEYS[$i]="config_monotonic"; VALUES[$i]=".true."; i=$i+1;
KEYS[$i]="config_vert_tracer_adv_order"; VALUES[$i]="3"; i=$i+1;
KEYS[$i]="config_horiz_tracer_adv_order"; VALUES[$i]="3"; i=$i+1;
-KEYS[$i]="config_thickness_adv_order"; VALUES[$i]="3"; i=$i+1;
#################################################
## Build perfect hex meshes using periodic_hex ##
@@ -263,14 +263,17 @@
                                        ## Generate new namelist.input file for test case
                                        STATS=`echo " $TOTAL_TIME / $TIME_STEP / 10 " | bc`
                                        cat MPAS-namelist.input.template \
-                                                | sed "s/config_time_integration .*/config_time_integration = ${TIME_INTEGRATOR}/g" \
+                                                | sed "s/config_time_integrator .*/config_time_integrator = ${TIME_INTEGRATOR}/g" \
                                                | sed "s/config_n_btr_subcycles .*/config_n_btr_subcycles = ${SUB_CYCLES}/g" \
                                                | sed "s/config_dt .*/config_dt = ${TIME_STEP}/g" \
-                                                | sed "s/config_h_mom_eddy_visc2 .*/config_h_mom_eddy_visc2 = ${VISC_H}/g" \
-                                                | sed "s/config_h_tracer_eddy_diff2 .*/config_h_tracer_eddy_diff2 = 0.0/g" \
+                                                | sed "s/config_mom_del2 .*/config_mom_del2 = ${VISC_H}/g" \
+                                                | sed "s/config_tracer_del2 .*/config_tracer_del2 = 0.0/g" \
                                                | sed "s/config_vert_visc .*/config_vert_visc = ${VISC_V}/g" \
                                                | sed "s/config_vert_diff .*/config_vert_diff = 0.0/g" \
-                                                | sed "s/config_stats_interval .*/config_stats_interval = ${STATS}/g" \
+                                                | sed "s/config_use_mom_del4 .*/config_use_mom_del4 = .false./g" \
+                                                | sed "s/config_use_tracer_del4 .*/config_use_tracer_del4 = .false./g" \
+                                                | sed "s/config_use_mom_del2 .*/config_use_mom_del2 = .true./g" \
+                                                | sed "s/config_use_tracer_del2 .*/config_use_tracer_del2 = .false./g" \
                                                > ${RUN_DIR}/namelist.input
                                done
                        done
@@ -293,14 +296,19 @@
                STATS=`echo " $TOTAL_TIME / $SCALED_TIME_STEP / 10 " | bc`
                cat MPAS-namelist.input.template \
                        | sed "s/config_run_duration .*/config_run_duration = ${DEFAULT_RUN_DURATION}/g" \
-                        | sed "s/config_time_integration .*/config_time_integration = ${DEFAULT_TIME_INTEGRATOR}/g" \
+                        | sed "s/config_time_integrator .*/config_time_integrator = ${DEFAULT_TIME_INTEGRATOR}/g" \
                        | sed "s/config_n_btr_subcycles .*/config_n_btr_subcycles = ${DEFAULT_SUBCYCLES}/g" \
                        | sed "s/config_dt .*/config_dt = ${SCALED_TIME_STEP}/g" \
-                        | sed "s/config_h_mom_eddy_visc2 .*/config_h_mom_eddy_visc2 = ${VISC_H}/g" \
-                        | sed "s/config_h_tracer_eddy_diff2 .*/config_h_tracer_eddy_diff2 = ${VISC_H}/g" \
+                        | sed "s/config_mom_del2 .*/config_mom_del2 = ${VISC_H}/g" \
+                        | sed "s/config_tracer_del2 .*/config_tracer_del2 = ${VISC_H}/g" \
                        | sed "s/config_vert_visc .*/config_vert_visc = ${VISC_V}/g" \
                        | sed "s/config_vert_diff .*/config_vert_diff = ${VISC_V}/g" \
-                        | sed "s/config_stats_interval .*/config_stats_interval = ${STATS}/g" \
+                        | sed "s/config_use_mom_del4 .*/config_use_mom_del4 = .false./g" \
+                        | sed "s/config_use_tracer_del4 .*/config_use_tracer_del4 = .false./g" \
+                        | sed "s/config_use_mom_del2 .*/config_use_mom_del2 = .true./g" \
+                        | sed "s/config_use_tracer_del2 .*/config_use_tracer_del2 = .false./g" \
+                        | sed "s/config_use_const_visc .*/config_use_const_visc = .true./g" \
+                        | sed "s/config_use_const_diff .*/config_use_const_diff = .true./g" \
                        > ${BASE_DIR}/namelist.input
        done
done
</font>
</pre>