GEOS-ESM · mathomp4 · Jun 10, 2024 · Aug 31, 2023 · Aug 31, 2023 · Aug 31, 2023
@@ -5186,8 +5186,8 @@ subroutine Driver ( RC )
         call MAPL_Get ( MAPL                 ,&
              RUNALARM  = ALARM                            ,&
              ORBIT     = ORBIT                            ,&
-             TILELATS  = LATS                             ,&
-             TILELONS  = LONS                             ,&
+             TILELATS  = LATS                             ,&      ! [radians]
+             TILELONS  = LONS                             ,&      ! [radians]
              INTERNAL_ESMF_STATE = INTERNAL               ,&
              RC=STATUS )
         VERIFY_(STATUS)
@@ -7238,7 +7238,7 @@ subroutine Driver ( RC )
 
         if (ntiles > 0) then
 
-           call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, &
+           call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, &                    ! LONS, LATS are in [radians] !!!
                 catchcn_internal%FWETC, catchcn_internal%FWETL, cat_id, VEG1,VEG2,FVEG1,FVEG2,DZSF     ,&
                 PCU      ,     PLSIN ,     SNO, ICE, FRZR            ,&
                 UUU                                                  ,&

@@ -5205,8 +5205,8 @@ subroutine Driver ( RC )
         call MAPL_Get ( MAPL                 ,&
              RUNALARM  = ALARM                            ,&
              ORBIT     = ORBIT                            ,&
-             TILELATS  = LATS                             ,&
-             TILELONS  = LONS                             ,&
+             TILELATS  = LATS                             ,&      ! [radians]
+             TILELONS  = LONS                             ,&      ! [radians]
              INTERNAL_ESMF_STATE = INTERNAL               ,&
              RC=STATUS )
         VERIFY_(STATUS)
@@ -7518,7 +7518,7 @@ subroutine Driver ( RC )
 ! -----------------------
         if (ntiles > 0) then
 
-           call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, &
+           call CATCHCN ( NTILES, LONS, LATS, DT,catchcn_internal%USE_FWET_FOR_RUNOFF, &                     ! LONS, LATS are in [radians] !!!
                 catchcn_internal%FWETC, catchcn_internal%FWETL, cat_id, VEG1,VEG2,FVEG1,FVEG2,DZSF     ,&
                 PCU      ,     PLSIN ,     SNO, ICE, FRZR            ,&
                 UUU                                                  ,&

@@ -135,7 +135,7 @@ MODULE CATCHMENT_CN_MODEL
   ! and the most recent version of the "unified" model (from Sept. 20, 2006).
 
   SUBROUTINE CATCHCN (                                           &
-       NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL, cat_id,    &
+       NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL, cat_id,    &  ! LONS, LATS are in [radians] !!!
        ITYP1,ITYP2,FVEG1,FVEG2,                                  &
        DZSF, TRAINC,TRAINL, TSNOW, TICE, TFRZR, UM,              &
        ETURB1, DEDQA1, DEDTC1, HSTURB1,DHSDQA1, DHSDTC1,         &
@@ -870,6 +870,7 @@ SUBROUTINE CATCHCN (                                           &
         sumdepth=sum(sndz)
 
         CALL StieglitzSnow_snowrt(                                             &
+                   LONS(N), LATS(N),                                           &  ! in      [radians]  !!!
                    N_sm, N_snow, MAPL_Land,                                    &  ! in   
                    CATCH_SNOW_MAXDEPTH, CATCH_SNOW_RHOFS, CATCH_SNOW_DZPARAM,  &  ! in   
                    t1, area, tkgnd, pr, snowf, ts, DTSTEP,                     &  ! in   

@@ -4183,13 +4183,12 @@ subroutine Driver ( RC )
         call MAPL_Get ( MAPL                 ,&
              RUNALARM  = ALARM                            ,&
              ORBIT     = ORBIT                            ,&
-             TILELATS  = LATS                             ,&
-             TILELONS  = LONS                             ,&
+             TILELATS  = LATS                             ,&      ! [radians]
+             TILELONS  = LONS                             ,&      ! [radians]
              INTERNAL_ESMF_STATE = INTERNAL               ,&
              RC=STATUS )
         VERIFY_(STATUS)
-
-
+
         ! --------------------------------------------------------------------------
         ! Get name of albedo files from configuration
         ! --------------------------------------------------------------------------
@@ -4631,7 +4630,7 @@ subroutine Driver ( RC )
         ! Catchment Id and vegetation types used to index into tables
         ! --------------------------------------------------------------------------
 
-        CAT_ID = 1
+        CAT_ID = -999                 ! meaningless!!!
         VEG    = nint(ITY)
 
         ! --------------------------------------------------------------------------
@@ -5469,10 +5468,10 @@ subroutine Driver ( RC )
 
         if (ntiles >0) then
 
-             call CATCHMENT ( NTILES, LONS, LATS                  ,&
+             call CATCHMENT ( NTILES, LONS, LATS                  ,&     ! LONS, LATS are in [radians] !!!
              DT,CATCH_INTERNAL_STATE%USE_FWET_FOR_RUNOFF          ,&
              CATCH_INTERNAL_STATE%FWETC, CATCH_INTERNAL_STATE%FWETL,&
-             cat_id, VEG, DZSF                                    ,&
+             cat_id, VEG, DZSF                                    ,&     ! cat_id is set to no-data above !!!
              PCU      ,     PLS       ,    SNO, ICE, FRZR         ,&
              UUU                                                  ,&
 
@@ -5582,7 +5581,7 @@ subroutine Driver ( RC )
             currTime=CURRENT_TIME+DELT,  &
             RC=STATUS )
         VERIFY_(STATUS)
-
+      
         ZTH = max(0.0,ZTH)
 
         ! --------------------------------------------------------------------------

@@ -129,8 +129,8 @@ MODULE CATCHMENT_MODEL
       CONTAINS
 
       SUBROUTINE CATCHMENT (                                                   &
-                     NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL,            &
-                     cat_id,ITYP,DZSF,TRAINC,TRAINL, TSNOW, TICE, TFRZR, UM,   &
+                     NCH, LONS, LATS, DTSTEP, UFW4RO, FWETC, FWETL,            &  ! LONS, LATS are in [radians] !!!
+                     cat_id,ITYP,DZSF,TRAINC,TRAINL, TSNOW, TICE, TFRZR, UM,   &  ! cat_id is set to no-data in GEOS_CatchGridcomp !!!
                      ETURB1, DEDQA1, DEDTC1, HSTURB1,DHSDQA1, DHSDTC1,         &
                      ETURB2, DEDQA2, DEDTC2, HSTURB2,DHSDQA2, DHSDTC2,         &
                      ETURB4, DEDQA4, DEDTC4, HSTURB4,DHSDQA4, DHSDTC4,         &
@@ -297,6 +297,8 @@ SUBROUTINE CATCHMENT (                                                   &
       integer  n_out
       integer  n_outs(20)
 
+      ! ---------------------------------
+
       numout =  0
 
 ! choose output point by lon and lat Input lons and lats are in radians
@@ -911,8 +913,9 @@ SUBROUTINE CATCHMENT (                                                   &
         tpsn1in(n) = tpsn1(n)    ! tpsn1 is "intent(out)", should NOT be used here, use catch_calc_tpsnow instead?  shouldn't this be the same as tcs_orig?  - reichle, 8/8/2014
 
         sumdepth=sum(sndz)
-
+        
         CALL StieglitzSnow_snowrt(                                             &
+                   LONS(N), LATS(N),                                           &  ! in    [radians]  !!!
                    N_sm, N_snow, MAPL_Land,                                    &  ! in   
                    CATCH_SNOW_MAXDEPTH, CATCH_SNOW_RHOFS, CATCH_SNOW_DZPARAM,  &  ! in   
                    t1, area, tkgnd, pr, snowf, ts, DTSTEP,                     &  ! in   
@@ -924,8 +927,7 @@ SUBROUTINE CATCHMENT (                                                   &
                    EVSN, SHFLS, alhfsn, hcorr, ghfluxsno(n),                   &  ! out  
                    sndzsc, wesnprec, sndzprec, sndz1perc,                      &  ! out     
                    wesnperc, wesndens, wesnrepar, mltwtr,                      &  ! out     
-                   excs, drho0, wesnbot, tksno, dtss                   )          ! out     
-
+                   excs, drho0, wesnbot, tksno, dtss     )                        ! out     
 
         FICESOUT(:,N)  = fices
 
@@ -2938,8 +2940,6 @@ subroutine catch_calc_tsurf( NTILES, tc1, tc2, tc4, wesnn, htsnn,    &
 
     logical                    :: ice1, tzero
 
-    logical, parameter         :: use_threshold_fac = .false.
-
     ! ------------------------------------------------------------------
 
     ! Compute tsurf excluding snow
@@ -2959,7 +2959,7 @@ subroutine catch_calc_tsurf( NTILES, tc1, tc2, tc4, wesnn, htsnn,    &
           ! StieglitzSnow_calc_tpsnow() returns snow temperature in deg Celsius
 
           call StieglitzSnow_calc_tpsnow( htsnn(1,n), wesnn(1,n), tpsn1, real_dummy,  &
-               ice1, tzero, use_threshold_fac ) 
+               ice1, tzero, .false. ) 
 
           tsurf(n) = (1. - asnow(n))*tsurf(n) + asnow(n)*(tpsn1 + TF)
 

@@ -3086,7 +3086,8 @@ subroutine LANDICECORE(RC)
 #endif
           TKSNO = condice 
 
-          call SNOWRT(1,NUM_SNOW_LAYERS,MAPL_LANDICE,                          &  ! in    
+          call SNOWRT( LONS(k), LATS(k),                                       &  ! in     [radians]  !!!
+                   1,NUM_SNOW_LAYERS,MAPL_LANDICE,                             &  ! in    
                    MAXSNDZ, RHOFRESH, DZMAX,                                   &  ! in    
                    LANDICELT(k),ZONEAREA,TKGND,PRECIP(k),SNO(k),TA(k),DT,      &  ! in    
                    EVAPI(k),DEVAPDT(k),SHF(k),SHD(k),ULW(k),BLW(k),            &  ! in    

@@ -2704,9 +2704,13 @@ subroutine CICECORE(NT,RC)
           DQS     = GEOS_QSAT(TS(:,N), PS, RAMP=0.0, PASCALS=.TRUE.) - QS(:,N)
           QS(:,N) = QS(:,N) + DQS
 
-          LHF     = LHF + EVD * MAPL_ALHS * DTS
+          EVP     = EVP + EVD * DTS
           SHF     = SHF + SHD * DTS
+          LHF     = EVP * MAPL_ALHS
+
 
+          if(associated(SUBLIM )) SUBLIM  = SUBLIM  + EVP    *FR(:,N)
+          if(associated(EVAPOUT)) EVAPOUT = EVAPOUT + EVP    *FR(:,N)
           if(associated(DELTS  )) DELTS   = DELTS   + DTS*CFT*FR(:,N)
           if(associated(DELQS  )) DELQS   = DELQS   + DQS*CFQ*FR(:,N)
           if(associated(TST    )) TST     = TST     + TS(:,N)*FR(:,N)
@@ -2724,6 +2728,8 @@ subroutine CICECORE(NT,RC)
     if(associated(QST    )) call Normalize(QST,    FRCICE) 
     if(associated(HLATICE)) call Normalize(HLATICE,FRCICE)
     if(associated(SHICE  )) call Normalize(SHICE,  FRCICE)
+    if(associated(SUBLIM )) call Normalize(SUBLIM, FRCICE)
+    if(associated(EVAPOUT)) call Normalize(EVAPOUT, FRCICE)
 
     if(associated(LWNDICE)) call Normalize(LWNDICE,  FRCICE, set_undef=.True.)
 

@@ -120,7 +120,7 @@
 #           - backfilled with global land average snow albedo where unavailable
 #           - must use compatible bcs version that includes MODIS-based snow albedo (e.g., v06, v08, v09, ...)
 #           - NOTE: bcs v06, v08, and v09 used approximate averaging of MODIS-based snow albedo to tile space;
-#             later bcs versions employ more accurate, raster-based averaging       
+#                   bcs v11 and v12 employ more accurate, raster-based averaging.
 #
 # GEOSagcm=>SNOW_ALBEDO_INFO: 0
 # GEOSldas=>SNOW_ALBEDO_INFO: 0