<p><b>duda</b> 2012-06-20 16:59:52 -0600 (Wed, 20 Jun 2012)</p><p>BRANCH COMMIT<br>
<br>
Add preprocessing directives (controlled by defining CAM_DYCORE in registry<br>
pre-processing and Fortran pre-processing) to remove/insert necessary code and<br>
registry variables for building MPAS-A as a CAM dycore.<br>
<br>
<br>
M src/core_nhyd_atmos/Registry<br>
M src/framework/mpas_timekeeping.F<br>
</p><hr noshade><pre><font color="gray">Modified: branches/cam_mpas_nh/src/core_nhyd_atmos/Registry
===================================================================
--- branches/cam_mpas_nh/src/core_nhyd_atmos/Registry 2012-06-20 14:40:08 UTC (rev 1996)
+++ branches/cam_mpas_nh/src/core_nhyd_atmos/Registry 2012-06-20 22:59:52 UTC (rev 1997)
@@ -180,11 +180,13 @@
var persistent real qv ( nVertLevels nCells Time ) 2 iro qv state scalars moist
var persistent real qc ( nVertLevels nCells Time ) 2 iro qc state scalars moist
var persistent real qr ( nVertLevels nCells Time ) 2 iro qr state scalars moist
+#ifndef CAM_DYCORE
var persistent real qi ( nVertLevels nCells Time ) 2 iro qi state scalars moist
var persistent real qs ( nVertLevels nCells Time ) 2 iro qs state scalars moist
var persistent real qg ( nVertLevels nCells Time ) 2 iro qg state scalars moist
var persistent real qnr ( nVertLevels nCells Time ) 2 iro qnr state scalars number
var persistent real qni ( nVertLevels nCells Time ) 2 iro qni state scalars number
+#endif
% Tendency variables
var persistent real tend_u ( nVertLevels nEdges Time ) 1 o u tend - -
@@ -194,11 +196,13 @@
var persistent real tend_qv ( nVertLevels nCells Time ) 1 o qv tend scalars moist
var persistent real tend_qc ( nVertLevels nCells Time ) 1 o qc tend scalars moist
var persistent real tend_qr ( nVertLevels nCells Time ) 1 o qr tend scalars moist
+#ifndef CAM_DYCORE
var persistent real tend_qi ( nVertLevels nCells Time ) 1 o qi tend scalars moist
var persistent real tend_qs ( nVertLevels nCells Time ) 1 o qs tend scalars moist
var persistent real tend_qg ( nVertLevels nCells Time ) 1 o qg tend scalars moist
var persistent real tend_qnr ( nVertLevels nCells Time ) 1 o qnr tend scalars number
var persistent real tend_qni ( nVertLevels nCells Time ) 1 o qni tend scalars number
+#endif
var persistent real rt_diabatic_tend ( nVertLevels nCells Time ) 1 r rt_diabatic_tend tend - -
var persistent real euler_tend_u ( nVertLevels nEdges Time ) 1 - u_euler tend - -
@@ -294,7 +298,24 @@
var persistent real surface_pressure ( nCells Time ) 1 iro surface_pressure diag - -
var persistent real surface_temperature ( nCells Time ) 1 o surface_temperature diag - -
+#ifdef CAM_DYCORE
+
%==================================================================================================
+% Tendency arrays for CAM phys
+%==================================================================================================
+var persistent real u_cam_tend ( nVertLevels nEdges Time ) 1 ro u tend_physics - -
+var persistent real ux_cam_tend ( nVertLevels nCells Time ) 1 ro ux tend_physics - -
+var persistent real uy_cam_tend ( nVertLevels nCells Time ) 1 ro uy tend_physics - -
+var persistent real theta_cam_tend ( nVertLevels nCells Time ) 1 ro theta tend_physics - -
+var persistent real qv_cam_tend ( nVertLevels nCells Time ) 1 o qv tend_physics scalars moist
+var persistent real qc_cam_tend ( nVertLevels nCells Time ) 1 o qc tend_physics scalars moist
+var persistent real qr_cam_tend ( nVertLevels nCells Time ) 1 o qr tend_physics scalars moist
+
+#endif
+
+#ifndef CAM_DYCORE
+
+%==================================================================================================
% DECLARATIONS OF ALL PHYSICS VARIABLES (will need to be moved to a Physics Registry shared by the
% hydrostatic and non-hydrostatic dynamical cores):
%==================================================================================================
@@ -371,9 +392,13 @@
namelist real physics config_bucket_rainc 0.0_RKIND
namelist real physics config_bucket_rainnc 0.0_RKIND
+#endif
+
var persistent real east ( R3 nCells ) 0 r east mesh - -
var persistent real north ( R3 nCells ) 0 r north mesh - -
+#ifndef CAM_DYCORE
+
%--------------------------------------------------------------------------------------------------
%... ARRAYS AND VARIABLES FOR UPDATING THE DEEP SOIL TEMPERATURE:
%--------------------------------------------------------------------------------------------------
@@ -415,9 +440,13 @@
var persistent real snownc ( nCells Time ) 1 ro snownc diag_physics - -
var persistent real graupelnc ( nCells Time ) 1 ro graupelnc diag_physics - -
+#endif
+
var persistent real qsat ( nVertLevels nCells Time ) 1 o qsat diag_physics - -
var persistent real relhum ( nVertLevels nCells Time ) 1 o relhum diag_physics - -
+#ifndef CAM_DYCORE
+
%--------------------------------------------------------------------------------------------------
%... PARAMETERIZATION OF CONVECTION:
%--------------------------------------------------------------------------------------------------
@@ -877,3 +906,5 @@
var persistent real tslb ( nSoilLevels nCells Time ) 1 iro tslb sfc_input - -
%==================================================================================================
+
+#endif
Modified: branches/cam_mpas_nh/src/framework/mpas_timekeeping.F
===================================================================
--- branches/cam_mpas_nh/src/framework/mpas_timekeeping.F 2012-06-20 14:40:08 UTC (rev 1996)
+++ branches/cam_mpas_nh/src/framework/mpas_timekeeping.F 2012-06-20 22:59:52 UTC (rev 1997)
@@ -1613,7 +1613,7 @@
end module mpas_timekeeping
-
+#ifndef CAM_DYCORE
subroutine wrf_error_fatal(msg)
implicit none
@@ -1625,3 +1625,4 @@
stop
end subroutine wrf_error_fatal
+#endif
</font>
</pre>