<p><b>laura@ucar.edu</b> 2011-06-02 10:51:13 -0600 (Thu, 02 Jun 2011)</p><p>moved all sfc_physics arrays to diag_physics arrays to limit the number of physics classes.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_physics/src/core_physics/module_physics_driver.F
===================================================================
--- branches/atmos_physics/src/core_physics/module_physics_driver.F        2011-06-02 16:50:32 UTC (rev 869)
+++ branches/atmos_physics/src/core_physics/module_physics_driver.F        2011-06-02 16:51:13 UTC (rev 870)
@@ -75,15 +75,14 @@
     if(l_radtsw) then
        call allocate_radiation_sw
        call driver_radiation_sw(itimestep,block%mesh,block%state%time_levs(1)%state, &amp;
-                               block%diag_physics,block%sfc_physics,block%sfc_input, &amp;
-                               block%tend_physics)
+                               block%diag_physics,block%sfc_input,block%tend_physics)
     endif
 
     !call to long wave radiation scheme:
     if(l_radtlw) then
        call allocate_radiation_lw
-       call driver_radiation_lw(itimestep,block%diag_physics,block%sfc_physics,       &amp;
-                               block%sfc_input,block%tend_physics)
+       call driver_radiation_lw(itimestep,block%diag_physics,block%sfc_input,        &amp;
+                               block%tend_physics)
     endif
 
     !deallocate all radiation arrays:
@@ -95,22 +94,21 @@
     !call to surface-layer scheme:
     if(config_sfclayer_scheme .ne. 'off') then
        call allocate_sfclayer
-       call driver_sfclayer(block%mesh,block%diag_physics,block%sfc_input,&amp;
-                            block%sfc_physics)
+       call driver_sfclayer(block%mesh,block%diag_physics,block%sfc_input)
        call deallocate_sfclayer
     endif
 
     !call to land-surface scheme:
     if(config_lsm_scheme .ne. 'off') then
        call allocate_lsm
-       call driver_lsm(itimestep,block%mesh,block%diag_physics,block%sfc_physics,block%sfc_input)
+       call driver_lsm(itimestep,block%mesh,block%diag_physics,block%sfc_input)
        call deallocate_lsm
     endif
 
     !call to pbl schemes:
     if(config_pbl_scheme .ne. 'off' .and. config_sfclayer_scheme .ne. 'off') then
        call allocate_pbl
-       call driver_pbl(block%diag_physics,block%sfc_physics,block%tend_physics)
+       call driver_pbl(block%diag_physics,block%tend_physics)
        call deallocate_pbl
     endif
 

Modified: branches/atmos_physics/src/core_physics/module_physics_init.F
===================================================================
--- branches/atmos_physics/src/core_physics/module_physics_init.F        2011-06-02 16:50:32 UTC (rev 869)
+++ branches/atmos_physics/src/core_physics/module_physics_init.F        2011-06-02 16:51:13 UTC (rev 870)
@@ -25,8 +25,7 @@
  contains
 
 !=============================================================================================
- subroutine physics_init(dminfo,config_do_restart,mesh,state,diag_physics,sfc_physics,       &amp;
-                         sfc_input)
+ subroutine physics_init(dminfo,config_do_restart,mesh,state,diag_physics,sfc_input)
 !=============================================================================================
 
 !input and output arguments:
@@ -36,8 +35,7 @@
  type(mesh_type),intent(in):: mesh
  type(state_type),intent(inout):: state
  type(diag_physics_type),intent(inout):: diag_physics
- type(sfc_physics_type) ,intent(inout):: sfc_physics
- type(sfc_input_type)   ,intent(inout):: sfc_input
+ type(sfc_input_type) ,intent(inout):: sfc_input
 
 !---------------------------------------------------------------------------------------------
  write(0,*) '--- enter subroutine physics_init:'
@@ -49,7 +47,7 @@
 !initialization of global surface properties. set here for now, but may be moved when time
 !manager is implemented:
  if(.not. config_do_restart) &amp;
-    call landuse_init_forMPAS(dminfo,mesh,diag_physics,sfc_physics,sfc_input)
+    call landuse_init_forMPAS(dminfo,mesh,diag_physics,sfc_input)
 
 !initialization of parameterized deep convective processes:
  if(config_conv_deep_scheme .ne. 'off') &amp;

Modified: branches/atmos_physics/src/core_physics/module_physics_landuse.F
===================================================================
--- branches/atmos_physics/src/core_physics/module_physics_landuse.F        2011-06-02 16:50:32 UTC (rev 869)
+++ branches/atmos_physics/src/core_physics/module_physics_landuse.F        2011-06-02 16:51:13 UTC (rev 870)
@@ -42,14 +42,13 @@
  contains
 
 !=============================================================================================
- subroutine landuse_init_forMPAS(dminfo,mesh,diag_physics,sfc_physics,sfc_input)
+ subroutine landuse_init_forMPAS(dminfo,mesh,diag_physics,sfc_input)
 !=============================================================================================
 
 !input arguments:
  type(dm_info),intent(in):: dminfo
  type(mesh_type),intent(in):: mesh
  type(diag_physics_type),intent(in):: diag_physics
- type(sfc_physics_type) ,intent(in):: sfc_physics
  type(sfc_input_type)   ,intent(in):: sfc_input
 
 !local variables:
@@ -89,15 +88,14 @@
  snowc    =&gt; sfc_input % snowc    % array
  xice     =&gt; sfc_input % xice     % array
 
- albbck   =&gt; sfc_physics % sfc_albbck % array
- embck    =&gt; sfc_physics % sfc_emibck % array
- xicem    =&gt; sfc_physics % xicem      % array
- xland    =&gt; sfc_physics % xland      % array
-
+ albbck     =&gt; diag_physics % sfc_albbck % array
+ embck      =&gt; diag_physics % sfc_emibck % array
  mavail     =&gt; diag_physics % mavail     % array
  sfc_albedo =&gt; diag_physics % sfc_albedo % array
  sfc_emiss  =&gt; diag_physics % sfc_emiss  % array
  thc        =&gt; diag_physics % thc        % array
+ xicem      =&gt; diag_physics % xicem      % array
+ xland      =&gt; diag_physics % xland      % array
  z0         =&gt; diag_physics % z0         % array
  znt        =&gt; diag_physics % znt        % array
  

</font>
</pre>