From 8704b9fb1e601ce1d93485c71a0d7234f2f585a4 Mon Sep 17 00:00:00 2001 From: "Brown, Jesse" <brownjm@ornl.gov> Date: Thu, 21 Apr 2022 13:38:09 +0000 Subject: [PATCH] Apply review comments --- sammy/src/blk/Broad_common.f90 | 8 ++--- sammy/src/clm/CrystalLatticeBroadening_M.f90 | 2 +- sammy/src/clm/dopush3.f | 2 +- sammy/src/cro/mcro5.f90 | 36 ++++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sammy/src/blk/Broad_common.f90 b/sammy/src/blk/Broad_common.f90 index d7e3fc8af..53a9c7e0e 100644 --- a/sammy/src/blk/Broad_common.f90 +++ b/sammy/src/blk/Broad_common.f90 @@ -68,10 +68,10 @@ module broad_common_m contains subroutine DopplerBroadenInfo_setDopple(this) -class(DopplerBroadenInfo)::this -if (associated(this%highEnergyFreeGas)) then - this%highEnergyFreeGas%Dopple = Dopple -end if + class(DopplerBroadenInfo)::this + if (associated(this%highEnergyFreeGas)) then + this%highEnergyFreeGas%Dopple = Dopple + end if end subroutine end module broad_common_m diff --git a/sammy/src/clm/CrystalLatticeBroadening_M.f90 b/sammy/src/clm/CrystalLatticeBroadening_M.f90 index fe48d47b7..f16185d0a 100644 --- a/sammy/src/clm/CrystalLatticeBroadening_M.f90 +++ b/sammy/src/clm/CrystalLatticeBroadening_M.f90 @@ -31,7 +31,7 @@ integer :: N_Contin = 0 integer :: N_Osc = 0 integer :: Nbeta = 0 integer :: Nbx = 0 -integer :: Nbeta_Max = 25999 +integer, parameter :: Nbeta_Max = 25999 real(kind=8):: Aaawww diff --git a/sammy/src/clm/dopush3.f b/sammy/src/clm/dopush3.f index 961e22abe..3b48d09b1 100644 --- a/sammy/src/clm/dopush3.f +++ b/sammy/src/clm/dopush3.f @@ -43,7 +43,7 @@ C SCATTERING LaW CALCULATION C Ei is in eV; Beta is unitless C C - ix=0 + ix=0 C *** Continuous part of distribution call allocate_real_data(calc%Sab, calc%Nbeta) CALL Cconti (calc, Alpha, Norm, Sumr) diff --git a/sammy/src/cro/mcro5.f90 b/sammy/src/cro/mcro5.f90 index be30a79d6..ffeeb1852 100644 --- a/sammy/src/cro/mcro5.f90 +++ b/sammy/src/cro/mcro5.f90 @@ -49,24 +49,24 @@ contains end subroutine normAndBack subroutine normAfterAng(moreBroadening, needIsos, broadener) - use DerivativeHandler_M - use DopplerAndResolutionBroadener_M - use SumIsoAndConvertToTrans_M - use array_sizes_common_m, only : calcData, calcDataSelf - use ifwrit_m, only : Kcros - use fixedi_m, only : numUsedPar - use, intrinsic :: ISO_C_BINDING - implicit none - logical(C_BOOL)::moreBroadening, needIsos - class(DopplerAndResolutionBroadener)::broadener - - type(SumIsoAndConvertToTrans)::summer - - call summer%initialize(broadener, calcDataSelf, Kcros.eq.8) - summer%Need_Isotopes= needIsos - summer%Another_Process_Will_Happen=moreBroadening - call summer%angPostProcessing(numUsedPar) - call summer%destroy + use DerivativeHandler_M + use DopplerAndResolutionBroadener_M + use SumIsoAndConvertToTrans_M + use array_sizes_common_m, only : calcData, calcDataSelf + use ifwrit_m, only : Kcros + use fixedi_m, only : numUsedPar + use, intrinsic :: ISO_C_BINDING + implicit none + logical(C_BOOL)::moreBroadening, needIsos + class(DopplerAndResolutionBroadener)::broadener + + type(SumIsoAndConvertToTrans)::summer + + call summer%initialize(broadener, calcDataSelf, Kcros.eq.8) + summer%Need_Isotopes= needIsos + summer%Another_Process_Will_Happen=moreBroadening + call summer%angPostProcessing(numUsedPar) + call summer%destroy end subroutine normAfterAng end module sumAndConvertAfterBroadening_m -- GitLab