From f202a2d70aab005bd7cec154a48e2106dbb6f76e Mon Sep 17 00:00:00 2001 From: biljanaorescanin Date: Wed, 18 Oct 2023 11:38:23 -0400 Subject: [PATCH 1/2] remove unused use statments; remove FPP coeffsib --- .../GEOScatchCN_GridComp/Shared/catchmentCN.F90 | 2 -- .../GEOScatch_GridComp/catchment.F90 | 2 -- .../GEOSland_GridComp/Shared/lsm_routines.F90 | 2 -- .../GEOSsurface_GridComp/Shared/StieglitzSnow.F90 | 14 ++++++-------- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90 index eea40eb69..459d4c335 100755 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90 @@ -102,8 +102,6 @@ MODULE CATCHMENT_CN_MODEL catch_calc_wtotl, dampen_tc_oscillations, & SRUNOFF - USE SIBALB_COEFF, ONLY: coeffsib - USE STIEGLITZSNOW, ONLY: & StieglitzSnow_snowrt, & StieglitzSnow_calc_asnow, & diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90 index 407e35984..ccab05af8 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90 @@ -103,8 +103,6 @@ MODULE CATCHMENT_MODEL catch_calc_wtotl, dampen_tc_oscillations, & SRUNOFF - USE SIBALB_COEFF, ONLY: coeffsib - USE STIEGLITZSNOW, ONLY: & StieglitzSnow_snowrt, & StieglitzSnow_calc_asnow, & diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/lsm_routines.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/lsm_routines.F90 index 6a409e71d..aab31393d 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/lsm_routines.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/lsm_routines.F90 @@ -1655,8 +1655,6 @@ SUBROUTINE SIBALB (NCH, ITYP, VLAI, VGRN, ZTH, & MODIS_SCALE_ = .FALSE. END IF -!FPP$ EXPAND (COEFFSIB) - DO I=1,NCH ALA = AMIN1 (AMAX1 (ZERO, VLAI(I)), ALATRM) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 index 748feecb9..52f538888 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 @@ -1540,14 +1540,16 @@ SUBROUTINE StieglitzSnow_trid(X,DD,D,RD,B,N) integer I,J real*4 RSF RSF=0. - DO 10 I=2,N + do I=2,N J=N+1-I if(D(J+1).ne.0.) RSF=RD(J)/D(J+1) D(J)=D(J)-DD(J+1)*RSF - 10 B(J)=B(J)- B(J+1)*RSF + B(J)=B(J)- B(J+1)*RSF + enddo if(D(1).ne.0.) X(1)=B(1)/D(1) - DO 20 J=2,N - 20 if(D(J).ne.0.) X(J)=(B(J)-DD(J)*X(J-1))/D(J) + do J=2,N + if(D(J).ne.0.) X(J)=(B(J)-DD(J)*X(J-1))/D(J) + enddo RETURN END SUBROUTINE StieglitzSnow_trid @@ -1641,8 +1643,6 @@ SUBROUTINE StieglitzSnow_snow_albedo( & ! ********************************************************************* -!FPP$ EXPAND (COEFFSIB) - if(SLOPE < 0.0) then GK_B = SLOPE else @@ -1775,8 +1775,6 @@ SUBROUTINE ALB_WITH_IMPURITY (N_snow, ZTH, & ! ********************************************************************* -!FPP$ EXPAND (COEFFSIB) - SZTH=ZTH DEGSZA=ACOS(SZTH)*180./PIE SZASIN=SQRT(1.-(SZTH**2.0)) From 47b49cb912183b819dd55012ecf166bfecaf5e3e Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:51:57 -0400 Subject: [PATCH 2/2] fixed indentation in previous commit (StieglitzSnow.F90) --- .../GEOSsurface_GridComp/Shared/StieglitzSnow.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 index 52f538888..28c9b5f9f 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90 @@ -1544,7 +1544,7 @@ SUBROUTINE StieglitzSnow_trid(X,DD,D,RD,B,N) J=N+1-I if(D(J+1).ne.0.) RSF=RD(J)/D(J+1) D(J)=D(J)-DD(J+1)*RSF - B(J)=B(J)- B(J+1)*RSF + B(J)=B(J)- B(J+1)*RSF enddo if(D(1).ne.0.) X(1)=B(1)/D(1) do J=2,N