Revet changes to MMM GWD scheme

bluefinweiwei · May 2, 2023 · 7d2d5a5 · 7d2d5a5
1 parent 7105049
commit 7d2d5a5
Showing 1 changed file with 10 additions and 27 deletions.
diff --git a/bl_gwdo.F90 b/bl_gwdo.F90
@@ -27,7 +27,7 @@ subroutine bl_gwdo_run(sina, cosa,                                          &
                      g_, cp_, rd_, rv_, fv_, pi_,                              &
                      dxmeter, deltim,                                          &
                      its, ite, kte, kme,                                       &
-                     l_norot, errmsg, errflg                                   )
+                     errmsg, errflg                                            )
 !-------------------------------------------------------------------------------
 !  
 !  abstract : 
@@ -96,7 +96,6 @@ subroutine bl_gwdo_run(sina, cosa,                                          &
    real(kind=kind_phys), dimension(its:ite)          , intent(in   ) :: var, oc1, &
                                                                         oa2d1, oa2d2, oa2d3, oa2d4, &
                                                                         ol2d1, ol2d2, ol2d3, ol2d4
-   logical                                           , intent(in   ) :: l_norot
    character(len=*)                                  , intent(  out) :: errmsg
    integer                                           , intent(  out) :: errflg
 !
@@ -228,13 +227,9 @@ subroutine bl_gwdo_run(sina, cosa,                                          &
 
        !  Earth-relative zonal and meridional winds (m/s)
 
-       if (l_norot) then
-          u1(i,k) = uproj(i,k)
-          v1(i,k) = uproj(i,k)
-       else
-          u1(i,k) = uproj(i,k)*cosa(i) - vproj(i,k)*sina(i)
-          v1(i,k) = uproj(i,k)*sina(i) + vproj(i,k)*cosa(i)
-       endif
+       u1(i,k) = uproj(i,k)*cosa(i) - vproj(i,k)*sina(i)
+       v1(i,k) = uproj(i,k)*sina(i) + vproj(i,k)*cosa(i)
+
      enddo
    enddo
 
@@ -595,27 +590,15 @@ subroutine bl_gwdo_run(sina, cosa,                                          &
 !
    do k = kts,kte
       do i = its,ite
-         if (l_norot) then
-            rublten(i,k) = dudt(i,k)
-            rvblten(i,k) = dvdt(i,k)
-            dtaux3d(i,k) = dtaux2d(i,k)
-            dtauy3d(i,k) = dtauy2d(i,k)
-         else
-            rublten(i,k) = rublten(i,k)+dudt(i,k)*cosa(i) + dvdt(i,k)*sina(i)
-            rvblten(i,k) = rvblten(i,k)-dudt(i,k)*sina(i) + dvdt(i,k)*cosa(i)
-            dtaux3d(i,k) = dtaux2d(i,k)*cosa(i) + dtauy2d(i,k)*sina(i)
-            dtauy3d(i,k) =-dtaux2d(i,k)*sina(i) + dtauy2d(i,k)*cosa(i)
-         endif
+         rublten(i,k) = rublten(i,k)+dudt(i,k)*cosa(i) + dvdt(i,k)*sina(i)
+         rvblten(i,k) = rvblten(i,k)-dudt(i,k)*sina(i) + dvdt(i,k)*cosa(i)
+         dtaux3d(i,k) = dtaux2d(i,k)*cosa(i) + dtauy2d(i,k)*sina(i)
+         dtauy3d(i,k) =-dtaux2d(i,k)*sina(i) + dtauy2d(i,k)*cosa(i)
      enddo
    enddo
    do i = its,ite
-      if (l_norot) then
-         dusfcg(i) = dusfc(i)
-         dvsfcg(i) = dvsfc(i)
-      else
-         dusfcg(i) = dusfc(i)*cosa(i) + dvsfc(i)*sina(i)
-         dvsfcg(i) =-dusfc(i)*sina(i) + dvsfc(i)*cosa(i)
-      endif
+      dusfcg(i) = dusfc(i)*cosa(i) + dvsfc(i)*sina(i)
+      dvsfcg(i) =-dusfc(i)*sina(i) + dvsfc(i)*cosa(i)
    enddo
    return                                                            
    end subroutine bl_gwdo_run