<p><b>dwj07@fsu.edu</b> 2012-04-05 09:15:55 -0600 (Thu, 05 Apr 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Some more cleanup on the idealized acc testcase.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/idealized_acc/basin_src/basin-template.F
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/idealized_acc/basin_src/basin-template.F 2012-04-04 21:58:42 UTC (rev 1750)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/idealized_acc/basin_src/basin-template.F 2012-04-05 15:15:55 UTC (rev 1751)
@@ -1012,13 +1012,6 @@
if(.not.real_bathymetry) then
kmt = nVertLevelsMOD
- ! solid boundary in y
- ymin = minval(yCell)
- write(6,*) ' minimum yCell ', ymin
- ymax = maxval(yCell)
- write(6,*) ' maximum yCell ', ymax
- where(yCell.lt.1.001*ymin) kmt = 0
- where(yCell.gt.0.999*ymax) kmt = 0
xmin = minval(xCell)
xmax = maxval(xCell)
@@ -1044,6 +1037,14 @@
enddo
! endif
enddo
+
+ ! solid boundary in y
+ ymin = minval(yCell)
+ write(6,*) ' minimum yCell ', ymin
+ ymax = maxval(yCell)
+ write(6,*) ' maximum yCell ', ymax
+ where(yCell.lt.1.001*ymin) kmt = 0
+ where(yCell.gt.0.999*ymax) kmt = 0
allocate(work_kmt(nCells))
work_kmt = 0.0
Modified: branches/ocean_projects/ocean_test_cases_staging/ocean/idealized_acc/makeMeshes.sh
===================================================================
--- branches/ocean_projects/ocean_test_cases_staging/ocean/idealized_acc/makeMeshes.sh 2012-04-04 21:58:42 UTC (rev 1750)
+++ branches/ocean_projects/ocean_test_cases_staging/ocean/idealized_acc/makeMeshes.sh 2012-04-05 15:15:55 UTC (rev 1751)
@@ -5,8 +5,7 @@
## To start, grids are periodic in the x direction. This may change later ##
########################################################################################
-SPACINGS="8000 4000 2000 1000"
-SPACINGS="8000"
+SPACINGS="80000 40000 20000 10000"
VERTLEVS="34"
RIDGESIZES="2000"
TCNAME="idealized_acc"
@@ -15,8 +14,8 @@
## Change reference spacing, time_step, and viscosities here ##
###############################################################
REF_TIME_STEP="300"
-REF_VISC_H="6900000.0"
-REF_VISC_V="6900000.0"
+REF_VISC_H="6900000000000.0"
+REF_VISC_V="0.00001"
REF_SPACING="80000.0"
TOTAL_TIME="17280000" # in seconds
@@ -38,21 +37,23 @@
############################################################
i=0
-KEYS[$i]="config_time_integration"; VALUES[$i]="'split_explicit'"; i=$i+1;
-KEYS[$i]="config_n_btr_subcycles"; VALUES[$i]="20"; i=$i+1;
-KEYS[$i]="config_run_duration"; VALUES[$i]="'0200_00:00:00'"; i=$i+1;
-KEYS[$i]="config_input_name"; VALUES[$i]="'grid.nc'"; i=$i+1;
-KEYS[$i]="config_output_name"; VALUES[$i]="'output.nc'"; i=$i+1;
-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]="'zlevel'"; i=$i+1;
-KEYS[$i]="config_rho0"; VALUES[$i]="1000"; i=$i+1;
-KEYS[$i]="config_bottom_drag_coeff"; VALUES[$i]="1.0e-3"; i=$i+1;
-KEYS[$i]="config_vert_visc_type"; VALUES[$i]="'const'"; i=$i+1;
-KEYS[$i]="config_vert_diff_type"; VALUES[$i]="'const'"; i=$i+1;
+KEYS[$i]="config_time_integration"; VALUES[$i]="'split_explicit'"; i=$i+1;
+KEYS[$i]="config_n_btr_subcycles"; VALUES[$i]="20"; i=$i+1;
+KEYS[$i]="config_run_duration"; VALUES[$i]="'0200_00:00:00'"; i=$i+1;
+KEYS[$i]="config_input_name"; VALUES[$i]="'grid.nc'"; i=$i+1;
+KEYS[$i]="config_output_name"; VALUES[$i]="'output.nc'"; i=$i+1;
+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]="'zlevel'"; i=$i+1;
+KEYS[$i]="config_rho0"; VALUES[$i]="1000"; i=$i+1;
+KEYS[$i]="config_bottom_drag_coeff"; VALUES[$i]="1.0e-3"; i=$i+1;
+KEYS[$i]="config_vert_visc_type"; VALUES[$i]="'const'"; i=$i+1;
+KEYS[$i]="config_vert_diff_type"; VALUES[$i]="'const'"; i=$i+1;
+KEYS[$i]="config_monotonic"; VALUES[$i]=".true."; i=$i+1;
+KEYS[$i]="config_h_mom_eddy_visc2"; VALUES[$i]="0.0"; i=$i+1;
+KEYS[$i]="config_h_tracer_eddy_diff2"; VALUES[$i]="0.0"; i=$i+1;
-
#################################################
## Build perfect hex meshes using periodic_hex ##
#################################################
@@ -165,7 +166,7 @@
D_SPACING=`echo "scale=4; ${SPACING}/${REF_SPACING}" | bc`
TIME_STEP=`echo "scale=4; $D_SPACING * $REF_TIME_STEP" | bc`
VISC_H=`echo "scale=4; ($D_SPACING^4)*${REF_VISC_H}" | bc`
- VISC_H=`echo ${REF_VISC_H}`
+# VISC_H=`echo ${REF_VISC_H}`
VISC_V=`echo ${REF_VISC_V}`
STATS=`echo " $TOTAL_TIME / $TIME_STEP / 10 " | bc`
@@ -226,8 +227,8 @@
## Generate new namelist.input file for test case
cat MPAS-namelist.input.template \
- | 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_h_mom_eddy_visc4 .*/config_h_mom_eddy_visc4 = ${VISC_H}/g" \
+ | sed "s/config_h_tracer_eddy_diff4 .*/config_h_tracer_eddy_diff4 = ${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_dt .*/config_dt = ${TIME_STEP}/g" \
</font>
</pre>