<p><b>laura@ucar.edu</b> 2011-05-09 11:27:00 -0600 (Mon, 09 May 2011)</p><p>corrections made for restartibility<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_physics/src/core_nhyd_atmos/Registry
===================================================================
--- branches/atmos_physics/src/core_nhyd_atmos/Registry 2011-05-05 16:12:29 UTC (rev 814)
+++ branches/atmos_physics/src/core_nhyd_atmos/Registry 2011-05-09 17:27:00 UTC (rev 815)
@@ -291,6 +291,8 @@
namelist integer physics config_n_radt_lw 01
namelist integer physics config_n_radt_sw 01
+namelist integer physics config_frac_seaice 00
+
namelist character physics config_microp_scheme off
namelist character physics config_conv_shallow_scheme off
namelist character physics config_conv_deep_scheme off
@@ -301,27 +303,9 @@
namelist character physics config_radt_sw_scheme off
namelist character physics config_sfclayer_scheme off
-#... VERTICALLY-INTEGRATED WATER SPECIES:
-
-# qv_col : vertically-integrated water vapor mixing ratio (kg/m2)
-# qc_col : vertically-integrated cloud water mixing ratio (kg/m2)
-# qr_col : vertically-integrated rain mixing ratio (kg/m2)
-# qi_col : vertically-integrated cloud ice mixing ratio (kg/m2)
-# qs_col " vertically-integrated snow mixing ratio (kg/m2)
-
var persistent real east ( R3 nCells ) 0 r east mesh - -
var persistent real north ( R3 nCells ) 0 r north mesh - -
-var persistent real qv_col ( nCells Time ) 1 o qv_col diag_physics - -
-var persistent real qc_col ( nCells Time ) 1 o qc_col diag_physics - -
-var persistent real qr_col ( nCells Time ) 1 o qr_col diag_physics - -
-var persistent real qi_col ( nCells Time ) 1 o qi_col diag_physics - -
-var persistent real qs_col ( nCells Time ) 1 o qs_col diag_physics - -
-var persistent real qg_col ( nCells Time ) 1 o qg_col diag_physics - -
-
-var persistent real qsat ( nVertLevels nCells Time ) 1 o qsat diag_physics - -
-var persistent real relhum ( nVertLevels nCells Time ) 1 o relhum diag_physics - -
-
#--------------------------------------------------------------------------------------------------
#... PARAMETERIZATION OF CLOUD MICROPHYSICS:
#--------------------------------------------------------------------------------------------------
@@ -334,15 +318,18 @@
# graupelncv: time-step grid-scale precipitation of graupel (mm)
# sr : time-step ratio of frozen versus total grid-scale precipitation (-)
-var persistent real rainncv ( nCells Time ) 1 o rainncv diag_physics - -
+var persistent real sr ( nCells Time ) 1 ro sr diag_physics - -
+var persistent real rainncv ( nCells Time ) 1 ro rainncv diag_physics - -
var persistent real snowncv ( nCells Time ) 1 o snowncv diag_physics - -
var persistent real graupelncv ( nCells Time ) 1 o graupelncv diag_physics - -
-var persistent real sr ( nCells Time ) 1 o sr diag_physics - -
var persistent real rainnc ( nCells Time ) 1 ro rainnc diag_physics - -
var persistent real snownc ( nCells Time ) 1 ro snownc diag_physics - -
var persistent real graupelnc ( nCells Time ) 1 ro graupelnc diag_physics - -
+var persistent real qsat ( nVertLevels nCells Time ) 1 o qsat diag_physics - -
+var persistent real relhum ( nVertLevels nCells Time ) 1 o relhum diag_physics - -
+
#--------------------------------------------------------------------------------------------------
#... PARAMETERIZATION OF CONVECTION:
#--------------------------------------------------------------------------------------------------
@@ -364,7 +351,6 @@
var persistent real cuprec ( nCells Time ) 1 ro cuprec diag_physics - -
var persistent real rainc ( nCells Time ) 1 ro rainc diag_physics - -
var persistent real raincv ( nCells Time ) 1 ro raincv diag_physics - -
-var persistent real iraincv ( nCells Time ) 1 o iraincv diag_physics - -
var persistent real rthcuten ( nVertLevels nCells Time ) 1 ro rthcuten tend_physics - -
var persistent real rqvcuten ( nVertLevels nCells Time ) 1 ro rqvcuten tend_physics - -
@@ -394,9 +380,9 @@
# rqcblten : tendency of cloud water mixing ratio due to pbl processes (kg/kg s-1)
# rqiblten : tendency of cloud ice mixing ratio due to pbl processes (kg/kg s-1)
-var persistent real kpbl ( nCells Time ) 1 ro kpbl diag_physics - -
+var persistent integer kpbl ( nCells Time ) 1 ro kpbl diag_physics - -
var persistent real hpbl ( nCells Time ) 1 ro hpbl diag_physics - -
-var persistent real exch_h ( nVertLevels nCells Time ) 1 ro exch_h diag_physics - -
+var persistent real exch_h ( nVertLevels nCells Time ) 1 o exch_h diag_physics - -
# TENDENCIES:
var persistent real rublten ( nVertLevels nCells Time ) 1 ro rublten tend_physics - -
@@ -415,68 +401,71 @@
# cda :drag coefficient at lowest model level [-]
# chs :???
# chs2 :???
-# cpm :???
# cqs2 :???
# ck :enthalpy exchange coefficient at 10 m [-]
# cka :enthalpy exchange coefficient at lowest model level [-]
-# gz1oz0 :log of z1 over z0 [-]
+# cpm :???
# flhc :exchange coefficient for heat [-]
# flqc :exchange coefficient for moisture [-]
+# gz1oz0 :log of z1 over z0 [-]
# hfx :upward heat flux at the surface [W/m2/s]
# lh :latent heat flux at the surface [W/m2]
# mavail :surface moisture availability [-]
# mol :T* in similarity theory [K]
# psih :similarity theory for heat [-]
# psim :similarity theory for momentum [-]
-# q2 :specific humidity at 2m [kg/kg]
# qfx :upward moisture flux at the surface [kg/m2/s]
# qgh :???
# qsfc :specific humidity at lower boundary [kg/kg]
# regime :flag indicating PBL regime (stable_p,unstable_p,etc...) [-]
# rmol :1 / Monin Ob length [-]
-# t2m :temperature at 2m [K]
-# th2m :potential temperature at 2m [K]
-# u10 :u at 10 m [m/s]
# ust :u* in similarity theory [m/s]
# ustm :u* in similarity theory without vconv [m/s]
-# v10 :v at 10 m [m/s]
-# wspd :wind speed [m/s]
# zol :z/L height over Monin-Obukhov length [-]
# znt :time-varying roughness length [m]
+# wspd :wind speed [m/s]
+# DIAGNOSTICS:
+# q2 :specific humidity at 2m [kg/kg]
+# u10 :u at 10 m [m/s]
+# v10 :v at 10 m [m/s]
+# t2m :temperature at 2m [K]
+# th2m :potential temperature at 2m [K]
+var persistent real hfx ( nCells Time ) 1 ro hfx diag_physics - -
+var persistent real mavail ( nCells Time ) 1 ro mavail diag_physics - -
+var persistent real mol ( nCells Time ) 1 ro mol diag_physics - -
+var persistent real qfx ( nCells Time ) 1 ro qfx diag_physics - -
+var persistent real qsfc ( nCells Time ) 1 ro qsfc diag_physics - -
+var persistent real ust ( nCells Time ) 1 ro ust diag_physics - -
+var persistent real ustm ( nCells Time ) 1 ro ustm diag_physics - -
+var persistent real zol ( nCells Time ) 1 ro zol diag_physics - -
+var persistent real znt ( nCells Time ) 1 ro znt diag_physics - -
+
var persistent real br ( nCells Time ) 1 ro br diag_physics - -
var persistent real cd ( nCells Time ) 1 ro cd diag_physics - -
var persistent real cda ( nCells Time ) 1 ro cda diag_physics - -
var persistent real chs ( nCells Time ) 1 ro chs diag_physics - -
var persistent real chs2 ( nCells Time ) 1 ro chs2 diag_physics - -
-var persistent real cpm ( nCells Time ) 1 ro cpm diag_physics - -
var persistent real cqs2 ( nCells Time ) 1 ro cqs2 diag_physics - -
var persistent real ck ( nCells Time ) 1 ro ck diag_physics - -
var persistent real cka ( nCells Time ) 1 ro cka diag_physics - -
-var persistent real gz1oz0 ( nCells Time ) 1 ro gz1oz0 diag_physics - -
+var persistent real cpm ( nCells Time ) 1 ro cpm diag_physics - -
var persistent real flhc ( nCells Time ) 1 ro flhc diag_physics - -
var persistent real flqc ( nCells Time ) 1 ro flqc diag_physics - -
-var persistent real hfx ( nCells Time ) 1 ro hfx diag_physics - -
+var persistent real gz1oz0 ( nCells Time ) 1 ro gz1oz0 diag_physics - -
var persistent real lh ( nCells Time ) 1 ro lh diag_physics - -
-var persistent real mavail ( nCells Time ) 1 ro mavail diag_physics - -
-var persistent real mol ( nCells Time ) 1 ro mol diag_physics - -
var persistent real psim ( nCells Time ) 1 ro psim diag_physics - -
var persistent real psih ( nCells Time ) 1 ro psih diag_physics - -
-var persistent real q2 ( nCells Time ) 1 ro q2 diag_physics - -
-var persistent real qfx ( nCells Time ) 1 ro qfx diag_physics - -
var persistent real qgh ( nCells Time ) 1 ro qgh diag_physics - -
-var persistent real qsfc ( nCells Time ) 1 ro qsfc diag_physics - -
var persistent real regime ( nCells Time ) 1 ro regime diag_physics - -
var persistent real rmol ( nCells Time ) 1 ro rmol diag_physics - -
-var persistent real t2m ( nCells Time ) 1 ro t2m diag_physics - -
-var persistent real th2m ( nCells Time ) 1 ro th2m diag_physics - -
+var persistent real wspd ( nCells Time ) 1 ro wspd diag_physics - -
+# DIAGNOSTICS:
var persistent real u10 ( nCells Time ) 1 ro u10 diag_physics - -
-var persistent real ust ( nCells Time ) 1 ro ust diag_physics - -
-var persistent real ustm ( nCells Time ) 1 ro ustm diag_physics - -
var persistent real v10 ( nCells Time ) 1 ro v10 diag_physics - -
-var persistent real wspd ( nCells Time ) 1 ro wspd diag_physics - -
-var persistent real zol ( nCells Time ) 1 ro zol diag_physics - -
-var persistent real znt ( nCells Time ) 1 ro znt diag_physics - -
+var persistent real q2 ( nCells Time ) 1 ro q2 diag_physics - -
+var persistent real t2m ( nCells Time ) 1 ro t2m diag_physics - -
+var persistent real th2m ( nCells Time ) 1 ro th2m diag_physics - -
#--------------------------------------------------------------------------------------------------
#... PARAMETERIZATION OF SHORTWAVE RADIATION:
@@ -501,7 +490,6 @@
# rthratensw:uncoupled theta tendency due to shortwave radiation [K s-1]
var persistent real coszr ( nCells Time ) 1 o coszr diag_physics - -
-var persistent real gsw ( nCells Time ) 1 o gsw diag_physics - -
var persistent real swcf ( nCells Time ) 1 o swcf diag_physics - -
var persistent real swdnb ( nCells Time ) 1 o swdnb diag_physics - -
var persistent real swdnbc ( nCells Time ) 1 o swdnbc diag_physics - -
@@ -511,13 +499,14 @@
var persistent real swupbc ( nCells Time ) 1 o swupbc diag_physics - -
var persistent real swupt ( nCells Time ) 1 o swupt diag_physics - -
var persistent real swuptc ( nCells Time ) 1 o swuptc diag_physics - -
+var persistent real gsw ( nCells Time ) 1 ro gsw diag_physics - -
var persistent real swdnflx ( nVertLevelsP2 nCells Time ) 1 o swdnflx diag_physics - -
var persistent real swdnflxc ( nVertLevelsP2 nCells Time ) 1 o swdnflxc diag_physics - -
var persistent real swupflx ( nVertLevelsP2 nCells Time ) 1 o swupflx diag_physics - -
var persistent real swupflxc ( nVertLevelsP2 nCells Time ) 1 o swupflxc diag_physics - -
-var persistent real rthratensw ( nVertLevels nCells Time ) 1 o rthratensw tend_physics - -
+var persistent real rthratensw ( nVertLevels nCells Time ) 1 ro rthratensw tend_physics - -
#--------------------------------------------------------------------------------------------------
#... PARAMETERIZATION OF LONGWAVE RADIATION:
@@ -545,7 +534,6 @@
# olrtoa :outgoing longwave radiation at top-of-the-atmosphere [W m-2]
# rthratenlw:uncoupled theta tendency due to longwave radiation [K s-1]
-var persistent real glw ( nCells Time ) 1 o glw diag_physics - -
var persistent real lwcf ( nCells Time ) 1 o lwcf diag_physics - -
var persistent real lwdnb ( nCells Time ) 1 o lwdnb diag_physics - -
var persistent real lwdnbc ( nCells Time ) 1 o lwdnbc diag_physics - -
@@ -556,11 +544,12 @@
var persistent real lwupt ( nCells Time ) 1 o lwupt diag_physics - -
var persistent real lwuptc ( nCells Time ) 1 o lwuptc diag_physics - -
var persistent real olrtoa ( nCells Time ) 1 o olrtoa diag_physics - -
+var persistent real glw ( nCells Time ) 1 ro glw diag_physics - -
-var persistent real lwdnflx ( nVertLevelsP2 nCells Time ) 1 o lwdnflx diag_physics - -
-var persistent real lwdnflxc ( nVertLevelsP2 nCells Time ) 1 o lwdnflxc diag_physics - -
-var persistent real lwupflx ( nVertLevelsP2 nCells Time ) 1 o lwupflx diag_physics - -
-var persistent real lwupflxc ( nVertLevelsP2 nCells Time ) 1 o lwupflxc diag_physics - -
+#var persistent real lwdnflx ( nVertLevelsP2 nCells Time ) 1 o lwdnflx diag_physics - -
+#var persistent real lwdnflxc ( nVertLevelsP2 nCells Time ) 1 o lwdnflxc diag_physics - -
+#var persistent real lwupflx ( nVertLevelsP2 nCells Time ) 1 o lwupflx diag_physics - -
+#var persistent real lwupflxc ( nVertLevelsP2 nCells Time ) 1 o lwupflxc diag_physics - -
var persistent real rthratenlw ( nVertLevels nCells Time ) 1 ro rthratenlw tend_physics - -
Modified: branches/atmos_physics/src/core_nhyd_atmos/module_mpas_core.F
===================================================================
--- branches/atmos_physics/src/core_nhyd_atmos/module_mpas_core.F 2011-05-05 16:12:29 UTC (rev 814)
+++ branches/atmos_physics/src/core_nhyd_atmos/module_mpas_core.F 2011-05-09 17:27:00 UTC (rev 815)
@@ -99,17 +99,13 @@
!proceed with initialization of physics parameterization if moist_physics is set to true:
if(moist_physics) then
- !initialization of all physics variables in registry:
- call physics_registry_init(config_do_restart, mesh, block % state % time_levs(1) % state, &
- block % diag, block % diag_physics, block % sfc_input )
- call physics_wrf_interface(mesh)
+ !initialization of seom input variables in registry:
+ call physics_registry_init(config_do_restart, mesh, block % sfc_input)
+ call physics_run_init(mesh)
- !initialization of some surface variables (temporary):
- !call physics_aquaplanet_init(mesh, block % diag_physics, block % sfc_input)
-
!initialization of all physics:
- call physics_init(dminfo, mesh, block % state % time_levs(1) % state, block % diag_physics, &
- block % sfc_physics, block % sfc_input)
+ call physics_init(dminfo, config_do_restart, mesh, block % state % time_levs(1) % state, &
+ block % diag_physics, block % sfc_physics, block % sfc_input)
endif
#endif
@@ -147,8 +143,8 @@
write(0,*) 'Doing timestep ', itimestep
call timer_start("time integration")
call mpas_timestep(domain, itimestep, dt)
- call timer_stop("time integration")
-
+ call timer_stop("time integration")
+
! Move time level 2 fields back into time level 1 for next time step
call shift_time_levels_state(domain % blocklist % state)
@@ -252,7 +248,7 @@
!update physics diagnostics at the end of dynamic time-step:
if(moist_physics) call physics_update(domain,dt)
#endif
-
+
end subroutine mpas_timestep
</font>
</pre>