<p><b>duda</b> 2011-12-12 11:49:17 -0700 (Mon, 12 Dec 2011)</p><p>BRANCH COMMIT<br>
<br>
Copy over recent changes to non-hydrostatic code from trunk revisions r1245, r1251, and r1252.<br>
<br>
<br>
M src/core_init_nhyd_atmos/mpas_init_atm_test_cases.F<br>
M src/core_init_nhyd_atmos/Registry<br>
M src/core_atmos_physics/mpas_atmphys_date_time.F<br>
M src/core_atmos_physics/mpas_atmphys_init.F<br>
M src/core_atmos_physics/mpas_atmphys_driver_lsm.F<br>
M src/core_atmos_physics/mpas_atmphys_landuse.F<br>
M src/core_nhyd_atmos/Registry<br>
</p><hr noshade><pre><font color="gray">Modified: branches/pio/src/core_atmos_physics/mpas_atmphys_date_time.F
===================================================================
--- branches/pio/src/core_atmos_physics/mpas_atmphys_date_time.F 2011-12-12 18:33:49 UTC (rev 1252)
+++ branches/pio/src/core_atmos_physics/mpas_atmphys_date_time.F 2011-12-12 18:49:17 UTC (rev 1253)
@@ -3,8 +3,7 @@
implicit none
private
- public:: get_current_date, &
- get_julgmt, &
+ public:: get_julgmt, &
monthly_interp_to_date, &
monthly_min_max
@@ -13,17 +12,6 @@
contains
!=============================================================================================
- subroutine get_current_date
-!=============================================================================================
-
-!temporary subroutine to provide the date at which the forecast begins.right now, that date is
-!hard-wired. This will change when the time manager is in place.
-
- current_date = '2010-10-23_00'
-
- end subroutine get_current_date
-
-!=============================================================================================
subroutine get_julgmt(date_str,julyr,julday,gmt)
!=============================================================================================
Modified: branches/pio/src/core_atmos_physics/mpas_atmphys_driver_lsm.F
===================================================================
--- branches/pio/src/core_atmos_physics/mpas_atmphys_driver_lsm.F 2011-12-12 18:33:49 UTC (rev 1252)
+++ branches/pio/src/core_atmos_physics/mpas_atmphys_driver_lsm.F 2011-12-12 18:49:17 UTC (rev 1253)
@@ -18,10 +18,10 @@
deallocate_lsm, &
driver_lsm
- logical,parameter:: rdxmaxalb = .true. !use snow albedo from geogrid;false use table values
- logical,parameter:: myj = .false. !true if using Mellor-Yamada PBL scheme.
- logical,parameter:: frpcpn = .false.
- logical,parameter:: rdlai2d = .false.
+ logical,parameter:: rdmaxalb = .false. !use snow albedo from geogrid;false use table values
+ logical,parameter:: myj = .false. !true if using Mellor-Yamada PBL scheme.
+ logical,parameter:: frpcpn = .false.
+ logical,parameter:: rdlai2d = .false.
!urban physics: since MPAS does not plan to run the urban physics option, the two options
!below are defined locally:
Modified: branches/pio/src/core_atmos_physics/mpas_atmphys_init.F
===================================================================
--- branches/pio/src/core_atmos_physics/mpas_atmphys_init.F 2011-12-12 18:33:49 UTC (rev 1252)
+++ branches/pio/src/core_atmos_physics/mpas_atmphys_init.F 2011-12-12 18:49:17 UTC (rev 1253)
@@ -73,8 +73,7 @@
!initialization of global surface properties. set here for now, but may be moved when time
!manager is implemented:
- if(.not. config_do_restart) &
- call landuse_init_forMPAS(dminfo,julday,mesh,diag_physics,sfc_input)
+ call landuse_init_forMPAS(dminfo,julday,mesh,diag_physics,sfc_input)
!initialization of parameterized deep convective processes:
if(config_conv_deep_scheme .ne. 'off') &
Modified: branches/pio/src/core_atmos_physics/mpas_atmphys_landuse.F
===================================================================
--- branches/pio/src/core_atmos_physics/mpas_atmphys_landuse.F 2011-12-12 18:33:49 UTC (rev 1252)
+++ branches/pio/src/core_atmos_physics/mpas_atmphys_landuse.F 2011-12-12 18:49:17 UTC (rev 1253)
@@ -6,7 +6,8 @@
module mpas_atmphys_landuse
use mpas_configure,only: input_landuse_data, &
config_sfc_albedo, &
- config_frac_seaice
+ config_frac_seaice, &
+ config_do_restart
use mpas_dmpar
use mpas_grid_types
@@ -184,6 +185,11 @@
DM_BCAST_MACRO(scfx)
write(0,*) '--- isice =',isice
write(0,*) '--- iswater =',iswater
+ if(config_do_restart) then
+ write(0,*) '--- config_do_restart =', config_do_restart
+ write(0,*) '--- skip the end of landuse_init_forMPAS'
+ return
+ endif
!defines the surface properties over the entire domain:
do iCell = 1, nCells
Modified: branches/pio/src/core_init_nhyd_atmos/Registry
===================================================================
--- branches/pio/src/core_init_nhyd_atmos/Registry 2011-12-12 18:33:49 UTC (rev 1252)
+++ branches/pio/src/core_init_nhyd_atmos/Registry 2011-12-12 18:49:17 UTC (rev 1253)
@@ -113,7 +113,7 @@
var persistent real fEdge ( nEdges ) 0 io fEdge mesh - -
var persistent real fVertex ( nVertices ) 0 io fVertex mesh - -
-var persistent real densityFunction ( nCells ) 0 iro densityFunction mesh - -
+var persistent real meshDensity ( nCells ) 0 iro meshDensity mesh - -
# some solver scalar coefficients
Modified: branches/pio/src/core_init_nhyd_atmos/mpas_init_atm_test_cases.F
===================================================================
--- branches/pio/src/core_init_nhyd_atmos/mpas_init_atm_test_cases.F 2011-12-12 18:33:49 UTC (rev 1252)
+++ branches/pio/src/core_init_nhyd_atmos/mpas_init_atm_test_cases.F 2011-12-12 18:49:17 UTC (rev 1253)
@@ -2069,7 +2069,7 @@
real (kind=RKIND), dimension(:,:), pointer :: sorted_arr
real(kind=RKIND), dimension(:), pointer :: hs, hs1
- real(kind=RKIND) :: hm, zh, dzmin, dzmina, dzminf, sm
+ real(kind=RKIND) :: hm, zh, dzmin, dzmina, dzmina_global, dzminf, sm
integer :: nsmterrain, kz, sfc_k
logical :: hybrid, smooth
@@ -3045,10 +3045,11 @@
! dzmina = minval(hs(:)-hx(k-1,:))
dzmina = minval(zw(k)+ah(k)*hs(:)-zw(k-1)-ah(k-1)*hx(k-1,:))
+ call mpas_dmpar_min_real(dminfo, dzmina, dzmina_global)
! write(0,*) ' k,i, dzmina, dzmin, zw(k)-zw(k-1) ', k,i, dzmina, dzmin, zw(k)-zw(k-1)
- if (dzmina >= dzmin*(zw(k)-zw(k-1))) then
+ if (dzmina_global >= dzmin*(zw(k)-zw(k-1))) then
hx(k,:)=hs(:)
- dzminf = dzmina
+ dzminf = dzmina_global
else
exit
end if
Modified: branches/pio/src/core_nhyd_atmos/Registry
===================================================================
--- branches/pio/src/core_nhyd_atmos/Registry 2011-12-12 18:33:49 UTC (rev 1252)
+++ branches/pio/src/core_nhyd_atmos/Registry 2011-12-12 18:49:17 UTC (rev 1253)
@@ -124,7 +124,7 @@
var persistent real fEdge ( nEdges ) 0 iro fEdge mesh - -
var persistent real fVertex ( nVertices ) 0 iro fVertex mesh - -
-var persistent real densityFunction ( nCells ) 0 iro meshDensity mesh - -
+var persistent real meshDensity ( nCells ) 0 iro meshDensity mesh - -
var persistent real meshScalingDel2 ( nEdges ) 0 ro meshScalingDel2 mesh - -
var persistent real meshScalingDel4 ( nEdges ) 0 ro meshScalingDel4 mesh - -
</font>
</pre>