diff --git a/extern/stim b/extern/stim index 6274046e..adae8024 160000 --- a/extern/stim +++ b/extern/stim @@ -1 +1 @@ -Subproject commit 6274046ea1b0088b218e706cda44a0ba0f7d48ec +Subproject commit adae8024f27a5786bdaae7565b7fb773e415db4d diff --git a/src/airsea/airsea.F90 b/src/airsea/airsea.F90 index 67085686..1468b148 100644 --- a/src/airsea/airsea.F90 +++ b/src/airsea/airsea.F90 @@ -64,7 +64,6 @@ module airsea_driver ! ! Meteorological forcing variables integer, public :: hum_method - integer, public :: back_radiation_method character(len=PATH_MAX) :: meteo_file type (type_scalar_input), public, target :: u10,v10 type (type_scalar_input), public, target :: airp,airt @@ -263,7 +262,7 @@ subroutine init_airsea_nml(namlst, fn) REALTYPE :: const_tx,const_ty REALTYPE :: const_precip REALTYPE :: precip_factor - !integer :: back_radiation_method jp--> to be used in ice must be declared as public outside of this subroutine. + integer :: back_radiation_method integer :: heat_method namelist /airsea/ calc_fluxes, & diff --git a/src/gotm/gotm.F90 b/src/gotm/gotm.F90 index 5e6ba3b2..700c9519 100644 --- a/src/gotm/gotm.F90 +++ b/src/gotm/gotm.F90 @@ -55,7 +55,7 @@ module gotm use airsea_driver, only: wind=>w,tx,ty,hum,I_0,cloud,heat,precip,evap,airp,albedo use airsea_driver, only: bio_albedo,bio_drag_scale use airsea_driver, only: u10,v10,airt,sst,sss - use airsea_driver, only: back_radiation_method,hum_method,fluxes_method + use airsea_driver, only: ql,hum_method,fluxes_method use airsea_variables, only: qa,ta #ifdef _ICE_ @@ -747,7 +747,7 @@ subroutine integrate_gotm() call do_ice(h(nlev),dt,T(nlev),S(nlev),ta,precip%value,Qsw, & surface_fluxes,julianday,secondsofday,longitude, & latitude,I_0%value,airt%value,airp%value,hum%value, & - u10%value,v10%value,cloud%value,rho(nlev),rho_0,back_radiation_method, & !sst,sss%value, + u10%value,v10%value,cloud%value,rho(nlev),rho_0,ql%method, & !sst,sss%value, !ql%method == longwave_radiation_method hum_method,fluxes_method,albedo,heat%value) #endif