fix undefined values, and also add standalone testing capability

NOAA-PSL · Nov 25, 2019 · f938910 · f938910
1 parent 1ea200f
commit f938910
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/compns_stochy.F90 b/compns_stochy.F90
@@ -84,6 +84,7 @@ subroutine compns_stochy (me,sz_nml,input_nml_file,fn_nml,nlunit,deltim,iret)
       ! mg, sfcperts
       do_sfcperts = .false.
       sppt_land = .false.
+      nsfcpert = 0
 ! for sfcperts random patterns
       sfc_lscale  = -999.       ! length scales
       sfc_tau     = -999.       ! time scales

diff --git a/makefile b/makefile
@@ -17,7 +17,6 @@ endif
 
 LIBRARY  = libstochastic_physics.a
 
-#FFLAGS   += -I./include -I../FV3/gfsphysics/ -I../FV3/atmos_cubed_sphere -I$(FMS_DIR) -I../FV3/namphysics
 FFLAGS   += -I../FV3/gfsphysics/ -I../FV3/atmos_cubed_sphere -I$(FMS_DIR) -I../FV3/namphysics
 
 SRCS_F   =

diff --git a/stochastic_physics.F90 b/stochastic_physics.F90
@@ -78,13 +78,14 @@ subroutine init_stochastic_physics(Model, Init_parm, ntasks, nthreads)
 ! update remaining model configuration parameters from namelist
 Model%use_zmtnblck=use_zmtnblck
 Model%skeb_npass=skeb_npass
+Model%nsfcpert=nsfcpert         ! mg, sfc-perts
 Model%pertz0=pertz0         ! mg, sfc-perts
 Model%pertzt=pertzt         ! mg, sfc-perts
 Model%pertshc=pertshc         ! mg, sfc-perts
 Model%pertlai=pertlai         ! mg, sfc-perts
 Model%pertalb=pertalb         ! mg, sfc-perts
 Model%pertvegf=pertvegf         ! mg, sfc-perts
-!if ( (.NOT. do_sppt) .AND. (.NOT. do_shum) .AND. (.NOT. do_skeb)  .AND. (.NOT. do_sfcperts) ) return
+if ( (.NOT. do_sppt) .AND. (.NOT. do_shum) .AND. (.NOT. do_skeb)  .AND. (.NOT. do_sfcperts) ) return
 allocate(sl(Model%levs))
 do k=1,Model%levs
    sl(k)= 0.5*(Init_parm%ak(k)/101300.+Init_parm%bk(k)+Init_parm%ak(k+1)/101300.0+Init_parm%bk(k+1)) ! si are now sigmas
@@ -220,8 +221,7 @@ subroutine run_stochastic_physics(Model, Grid, Coupling, nthreads)
 character*120 :: sfile
 character*6   :: STRFH
 
-!if ( (.NOT. Model%do_sppt) .AND. (.NOT. Model%do_shum) .AND. (.NOT. Model%do_skeb) ) return
-!if ( (.NOT. Model%do_sppt) .AND. (.NOT. Model%do_shum) .AND. (.NOT. Model%do_skeb)  .AND. (.NOT. Model%do_sfcperts) ) return
+if ( (.NOT. Model%do_sppt) .AND. (.NOT. Model%do_shum) .AND. (.NOT. Model%do_skeb) ) return
 
 ! Update number of threads in shared variables in spectral_layout_mod and set block-related variables
 ompthreads = nthreads
@@ -317,7 +317,7 @@ subroutine run_stochastic_physics_sfc(Model, Grid, Coupling)
 integer :: nblks, blk, len, maxlen
 character*120 :: sfile
 character*6   :: STRFH
-!if (.NOT. Model%do_sfcperts) return
+if (.NOT. Model%do_sfcperts) return
 
 ! Set block-related variables
 nblks = size(Model%blksz)

diff --git a/stochy_data_mod.F90 b/stochy_data_mod.F90
@@ -61,7 +61,7 @@ subroutine init_stochdata(nlevs,delt,input_nml_file,fn_nml,nlunit,iret)
    iret=0
    if(is_master()) print*,'in init stochdata'
    call compns_stochy (me,size(input_nml_file,1),input_nml_file(:),fn_nml,nlunit,delt,iret)
-!   if ( (.NOT. do_sppt) .AND. (.NOT. do_shum) .AND. (.NOT. do_skeb)  .AND. (.NOT. do_sfcperts) ) return
+   if ( (.NOT. do_sppt) .AND. (.NOT. do_shum) .AND. (.NOT. do_skeb)  .AND. (.NOT. do_sfcperts) ) return
    if (nodes.GE.lat_s/2) then
       lat_s=(int(nodes/12)+1)*24
       lon_s=lat_s*2