From aff3de37820a4e7a30e66ca41b9440fbeea171ac Mon Sep 17 00:00:00 2001 From: Joseph Zhang Date: Thu, 23 Jan 2025 20:51:28 -0500 Subject: [PATCH] clarified unit for stmp in nws=4; thx Saeed! --- sample_inputs/atmos.nc | Bin 36836 -> 37028 bytes src/Hydro/misc_subs.F90 | 4 ++-- src/Hydro/schism_step.F90 | 5 +++-- src/Hydro/sflux_9c.F90 | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sample_inputs/atmos.nc b/sample_inputs/atmos.nc index 46b8c11f6fdf4dffcd26e8e5a06e6947ea8a54d1..d8a8f9fe227f1cf956ceb6e0a192601ecdccb43d 100644 GIT binary patch delta 4352 zcmaDdpJ~ZLrU_2~sg*)ra$$s{H%CS{k& zI!xM(PbNn&X>mKXFfcH%7U$Kj=cI~W)S4A&2&W(4{QP)jekf!9H?wK zn*Rs302(d-2P)-5>>VxtN6Y_#41v-7KbrpsG6Y8J|B+q)+f$hMHh&aS7Mvu^zga}( GLN)*rDu*Nh delta 4159 zcmZ3okm<>MrU_0=3`Zw^J2`nT<1$v3;*#8g$qSg|n3!EA&tOtx5_&TE0FxGzQp@Bw zOxlbplO>q7xE+r$Ffgzd=jS9AO;%)9WC~1~T)=G3#R3v7C`v3z1&Q((ECKR4i}Ui! z<6&a;4KB_T85jl(*AJxSK)dS)%;yk~*AHCKgB?&mfN>9Uz-asrYyupOe@H$YsBAcz z{|B}J8ZG|^D&<4$9WDPy%m0B4fzkXwn*Rqf1V-!skzN1WQ<(TRZxmJ*oP0o-fAbZU G3)ui5opi?l diff --git a/src/Hydro/misc_subs.F90 b/src/Hydro/misc_subs.F90 index be5fca58..c17784ae 100644 --- a/src/Hydro/misc_subs.F90 +++ b/src/Hydro/misc_subs.F90 @@ -314,7 +314,7 @@ subroutine other_hot_init(time) if(j/=NF90_NOERR) call parallel_abort('MISC: atmos.nc prmsl') j=nf90_get_var(ncid_atmos,mm,rwild(3,:),(/1,ninv+1/),(/np_global,1/)) if(j/=NF90_NOERR) call parallel_abort('MISC: atmos.nc prmsl(2)') - j=nf90_inq_varid(ncid_atmos, "stmp",mm) + j=nf90_inq_varid(ncid_atmos, "stmp_in_centigrade",mm) if(j/=NF90_NOERR) call parallel_abort('MISC: atmos.nc stmp') j=nf90_get_var(ncid_atmos,mm,rwild(4,:),(/1,ninv+1/),(/np_global,1/)) if(j/=NF90_NOERR) call parallel_abort('MISC: atmos.nc stmp(2)') @@ -375,7 +375,7 @@ subroutine other_hot_init(time) j=nf90_inq_varid(ncid_atmos, "prmsl",mm) j=nf90_get_var(ncid_atmos,mm,rwild(3,:),(/1,ninv+2/),(/np_global,1/)) if(j/=NF90_NOERR) call parallel_abort('MISC: atmos.nc prmsl(3)') - j=nf90_inq_varid(ncid_atmos, "stmp",mm) + j=nf90_inq_varid(ncid_atmos, "stmp_in_centigrade",mm) j=nf90_get_var(ncid_atmos,mm,rwild(4,:),(/1,ninv+1/),(/np_global,1/)) if(j/=NF90_NOERR) call parallel_abort('MISC: atmos.nc stmp(3)') j=nf90_inq_varid(ncid_atmos, "spfh",mm) diff --git a/src/Hydro/schism_step.F90 b/src/Hydro/schism_step.F90 index a8ba7417..58e15e48 100644 --- a/src/Hydro/schism_step.F90 +++ b/src/Hydro/schism_step.F90 @@ -599,7 +599,8 @@ subroutine schism_step(it) if(j/=NF90_NOERR) call parallel_abort('STEP: atmos.nc prmsl') j=nf90_get_var(ncid_atmos,mm,rwild6(3,:),(/1,itmp2/),(/np_global,1/)) if(j/=NF90_NOERR) call parallel_abort('STEP: atmos.nc prmsl(2)') - j=nf90_inq_varid(ncid_atmos, "stmp",mm) + !air T in centigrade not Kelvin + j=nf90_inq_varid(ncid_atmos, "stmp_in_centigrade",mm) if(j/=NF90_NOERR) call parallel_abort('STEP: atmos.nc stmp') j=nf90_get_var(ncid_atmos,mm,rwild6(4,:),(/1,itmp2/),(/np_global,1/)) if(j/=NF90_NOERR) call parallel_abort('STEP: atmos.nc stmp(2)') @@ -658,7 +659,7 @@ subroutine schism_step(it) call exchange_p2d(windx2) call exchange_p2d(windy2) call exchange_p2d(pr2) - call exchange_p2d(airt2) + call exchange_p2d(airt2) !centigrade call exchange_p2d(shum2) call exchange_p2d(srad) call exchange_p2d(hradd) diff --git a/src/Hydro/sflux_9c.F90 b/src/Hydro/sflux_9c.F90 index 769e2737..ac7e744d 100644 --- a/src/Hydro/sflux_9c.F90 +++ b/src/Hydro/sflux_9c.F90 @@ -67,6 +67,7 @@ ! get_rad (called from within surf_fluxes) ! get_precip_flux (called from within surf_fluxes - IF ENABLED) ! surf_fluxes (called from within SCHISM) +! surf_fluxes2 (alternative form called from within SCHISM) ! ! In addition, there are a number of secondary routines and functions ! that are called by those listed above. For a complete list see below @@ -266,6 +267,7 @@ ! ! List of all routines in this file: ! surf_fluxes +! surf_fluxes2 ! turb_fluxes: Calculate bulk aerodynamic surface fluxes over water using method of ! Zeng et al or Fairall (computes the bulk parameterization of surface wind stress and ! surface net heat fluxes using method of Fairall et al.