<p><b>mpetersen@lanl.gov</b> 2012-10-04 09:03:06 -0600 (Thu, 04 Oct 2012)</p><p>TRUNK COMMIT: Change monthly forcing variables in Registry from iro to - so they are not required upon start-up. This means simulations with monthly forcing must change this back to iro. I also added a message about this and some minor formatting change for the error file output.<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/mpas/src/core_ocean/Registry
===================================================================
--- trunk/mpas/src/core_ocean/Registry        2012-10-04 14:54:05 UTC (rev 2181)
+++ trunk/mpas/src/core_ocean/Registry        2012-10-04 15:03:06 UTC (rev 2182)
@@ -208,10 +208,10 @@
var persistent real temperatureRestore ( nCells ) 0 iro temperatureRestore mesh - -
var persistent real salinityRestore ( nCells ) 0 iro salinityRestore mesh - -
-% mrp trying to figure out why these do not appear
-var persistent real windStressMonthly ( nMonths nEdges ) 0 iro windStressMonthly mesh - -
-var persistent real temperatureRestoreMonthly ( nMonths nCells ) 0 iro temperatureRestoreMonthly mesh - -
-var persistent real salinityRestoreMonthly ( nMonths nCells ) 0 iro salinityRestoreMonthly mesh - -
+% Monthly forcing variables. Change to iro when monthly forcing is used.
+var persistent real windStressMonthly ( nMonths nEdges ) 0 - windStressMonthly mesh - -
+var persistent real temperatureRestoreMonthly ( nMonths nCells ) 0 - temperatureRestoreMonthly mesh - -
+var persistent real salinityRestoreMonthly ( nMonths nCells ) 0 - salinityRestoreMonthly mesh - -
% Prognostic variables: read from input, saved in restart, and written to output
var persistent real u ( nVertLevels nEdges Time ) 2 ir u state - -
Modified: trunk/mpas/src/core_ocean/mpas_ocn_monthly_forcing.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_monthly_forcing.F        2012-10-04 14:54:05 UTC (rev 2181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_monthly_forcing.F        2012-10-04 15:03:06 UTC (rev 2182)
@@ -176,6 +176,8 @@
if(config_use_monthly_forcing) then
monthlyForcingOn = .true.
+
+ write (0,'(a)') " Monthly forcing is on. Make sure monthly forcing variables include iro in Registry, and are in your initial condition or restart file."
end if
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F        2012-10-04 14:54:05 UTC (rev 2181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F        2012-10-04 15:03:06 UTC (rev 2182)
@@ -116,27 +116,27 @@
call ocn_init_split_timestep(domain)
- print *, ' Vertical grid type is: ',config_vert_grid_type
+ write (0,'(a,a10)'), ' Vertical grid type is: ',config_vert_grid_type
if (config_vert_grid_type.ne.'isopycnal'.and. &
config_vert_grid_type.ne.'zlevel'.and. &
config_vert_grid_type.ne.'zstar1'.and. &
config_vert_grid_type.ne.'zstar'.and. &
config_vert_grid_type.ne.'zstarWeights') then
- print *, ' Incorrect choice of config_vert_grid_type.'
+ write (0,*) ' Incorrect choice of config_vert_grid_type.'
call mpas_dmpar_abort(dminfo)
endif
- print *, ' Pressure type is: ',config_pressure_type
+ write (0,'(a,a10)'), ' Pressure type is: ',config_pressure_type
if (config_pressure_type.ne.'pressure'.and. &
config_pressure_type.ne.'MontgomeryPotential') then
- print *, ' Incorrect choice of config_pressure_type.'
+ write (0,*) ' Incorrect choice of config_pressure_type.'
call mpas_dmpar_abort(dminfo)
endif
if (config_filter_btr_mode.and. &
config_vert_grid_type.ne.'zlevel')then
- print *, 'filter_btr_mode has only been tested with'// &
+ write (0,*) 'filter_btr_mode has only been tested with'// &
' config_vert_grid_type=zlevel.'
call mpas_dmpar_abort(dminfo)
endif
Modified: trunk/mpas/src/framework/mpas_io_input.F
===================================================================
--- trunk/mpas/src/framework/mpas_io_input.F        2012-10-04 14:54:05 UTC (rev 2181)
+++ trunk/mpas/src/framework/mpas_io_input.F        2012-10-04 15:03:06 UTC (rev 2182)
@@ -262,7 +262,7 @@
call mpas_dmpar_abort(domain % dminfo)
end if
!write(0,*) 'MGD DEBUGGING time = ', input_obj % time
- write(0,*) 'Restarting model from time ', timeStamp
+ write(0,*) 'Restarting model from time ', trim(timeStamp)
end if
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</font>
</pre>