Merge branch 'develop' into feature/update-ci-reusable-gocart

Author: mathomp4

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Check userRC in ESMF_GridCompRun in GOCART2G gridcomp
 - The pressure lid change associated with the introduction of run0 to set 0 above the lid
 - Fwet value in dust modified from 0.8 to 1.0
 - Dust and Sea salt Emission scale factors updated for L181
@@ -25,8 +26,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - ESMA_cmake v3.68.0
   - GMAO_Shared v2.1.4
   - MAPL v2.63.0
+- fwet removed from children GridCompMod and placed in respective instance RC files
+- Updated settling routine and calls to allow settling velocity diagnostics in output field
 
 ### Fixed
+- In DU2G_GridCompMod.F90 remove unnecessary "if(associated())" check for DU_SRC
+  to future proof for application of new MAPL filtering
 
 - Units error in sulfate surface area density calculation in Process Library corrected
 - Removed erroneous/extraneous friendly attributes to internal state for DU and NI

CMakeLists.txt

@@ -57,6 +57,7 @@ if (UFS_GOCART)
   message ("Force 32-bit build for GOCART")
   if (CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
     string (REPLACE "-real-size 64" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
+    set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -check -check noarg_temp_created -ftrapuv")
   elseif (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
     string (REPLACE "-fdefault-real-8" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
   endif()

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridCompMod.F90

@@ -988,7 +988,7 @@ subroutine Run2 (GC, import, export, clock, RC)
 
     integer                           :: n
     real, allocatable, dimension(:,:) :: drydepositionfrequency, dqa
-    real                              :: fwet
+    real, pointer, dimension(:,:,:)   :: casd_vel
     real, dimension(3)                :: rainout_eff
     logical                           :: KIN
     real, allocatable, dimension(:,:,:)   :: pSOA_VOC
@@ -1097,13 +1097,15 @@ subroutine Run2 (GC, import, export, clock, RC)
     end select
 
     do n = 1, self%nbins
-       call MAPL_VarSpecGet(InternalSpec(n), SHORT_NAME=short_name, __RC__)
-       call MAPL_GetPointer(internal, NAME=short_name, ptr=int_ptr, __RC__)
-       nullify(flux_ptr)
-       flux_ptr => SD(:,:,n)
-       call Chem_SettlingSimple (self%km, self%klid, self%diag_Mie, n, self%cdt, MAPL_GRAV, &
+        call MAPL_VarSpecGet(InternalSpec(n), SHORT_NAME=short_name, __RC__)
+        call MAPL_GetPointer(internal, NAME=short_name, ptr=int_ptr, __RC__)
+        nullify(flux_ptr)
+        flux_ptr => SD(:,:,n)
+        nullify(casd_vel)
+        if (associated(SD_V)) casd_vel => SD_V(:,:,:,n)
+        call Chem_SettlingSimple (self%km, self%klid, self%diag_Mie, n, self%cdt, MAPL_GRAV, &
                         int_ptr, t, airdens, &
-                        rh2, zle, delp, flux_ptr, settling_scheme=settling_opt, __RC__)
+                        rh2, zle, delp, flux_ptr, casd_vel, settling_scheme=settling_opt, __RC__)
     end do
 
 
@@ -1138,9 +1140,8 @@ subroutine Run2 (GC, import, export, clock, RC)
        if (associated(WT)) WT(:,:,1)=0.0
 
 !      Hydrophilic mode (second tracer) is removed
-       fwet = 1.
        call WetRemovalGOCART2G (self%km, self%klid, self%nbins, self%nbins, 2, self%cdt, GCsuffix, &
-                                KIN, MAPL_GRAV, fwet, philic, ple, t, airdens, &
+                                KIN, MAPL_GRAV, self%fwet(2), philic, ple, t, airdens, &
                                 pfl_lsan, pfi_lsan, cn_prcp, ncn_prcp, WT, __RC__)
     case ('ufs')
 !      Both hydrophobic and hydrophilic modes can be removed

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc

@@ -76,6 +76,7 @@ category: EXPORT
 #----------------------------------------------------------------------------------------
  *MASS        | kg kg-1      | xyz   | C     |                                | * Aerosol Mass Mixing Ratio
  *CONC        | kg m-3       | xyz   | C     |                                | * Aerosol Mass Concentration
+ *SD_V        | m s-1        | xyz   | C     | self%nbins                     | * Aerosol Settling Velocity (Bin %d)
  *EXTCOEF     | m-1          | xyz   | C     | size(self%wavelengths_profile) | * Aerosol Extinction Coefficient
  *EXTCOEFRH20 | m-1          | xyz   | C     | size(self%wavelengths_profile) | * Aerosol Extinction Coefficient - Fixed RH=20%
  *EXTCOEFRH80 | m-1          | xyz   | C     | size(self%wavelengths_profile) | * Aerosol Extinction Coefficient - Fixed RH=80%

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_instance_CA.bc.rc

@@ -23,9 +23,12 @@ time_days_chemical_destruction: -1.  -1.
 # Wet Removal Scheme Option | gocart, ufs
 wet_removal_scheme: gocart ! default value
 
-# Scavenging efficiency per bin [km-1] (NOT USED UNLESS RAS IS CALLED)
+# Scavenging efficiency per bin [km-1]
 fscav: 0.0  0.4
 
+# Large scale rainout efficiency per bin for wet_removal_scheme == gocart
+fwet: 0.0  1.0
+
 # Rainout efficiency per bin for wet_removal_scheme == ufs
 fwet_ice: 0.0 1.0
 fwet_snow: 0.0 1.0
@@ -54,4 +57,4 @@ point_emissions_srcfilen: /dev/null
 
 # SettlingSolver options
 # Options: 'gocart' or 'ufs'
-settling_scheme: 'gocart'
+settling_scheme: 'gocart'

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_instance_CA.br.rc

@@ -29,9 +29,12 @@ time_days_chemical_destruction: -1.   -1.
 # Wet Removal Scheme Option | gocart, ufs
 wet_removal_scheme: gocart ! default value
 
-# Scavenging efficiency per bin [km-1] (NOT USED UNLESS RAS IS CALLED)
+# Scavenging efficiency per bin [km-1]
 fscav: 0.0  0.4
 
+# Large scale rainout efficiency per bin for wet_removal_scheme == gocart
+fwet: 0.0  1.0
+
 # Rainout efficiency per bin for wet_removal_scheme == ufs
 fwet_ice: 0.0 0.4
 fwet_snow: 0.0 0.4
@@ -57,4 +60,4 @@ point_emissions_srcfilen: /dev/null
 
 # SettlingSolver options
 # Options: 'gocart' or 'ufs'
-settling_scheme: 'gocart'
+settling_scheme: 'gocart'

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_instance_CA.oc.rc

@@ -33,9 +33,12 @@ time_days_chemical_destruction: -1.  -1.
 # Wet Removal Scheme Option | gocart, ufs
 wet_removal_scheme: gocart ! default value
 
-# Scavenging efficiency per bin [km-1] (NOT USED UNLESS RAS IS CALLED)
+# Scavenging efficiency per bin [km-1]
 fscav: 0.0  0.4
 
+# Large scale rainout efficiency per bin for wet_removal_scheme == gocart
+fwet: 0.0  1.0
+
 # Rainout efficiency per bin for wet_removal_scheme == ufs
 fwet_ice: 0.0 1.0
 fwet_snow: 0.0 1.0
@@ -61,4 +64,4 @@ point_emissions_srcfilen: /dev/null
 
 # SettlingSolver options
 # Options: 'gocart' or 'ufs'
-settling_scheme: 'gocart'
+settling_scheme: 'gocart'

ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90

@@ -175,7 +175,6 @@ subroutine SetServices (GC, RC)
     if (MAPL_AM_I_ROOT()) then
        write (*,*) trim(Iam)//": Dust emission scheme is "//trim(self%emission_scheme)
     end if
-
     ! Point Sources
     call ESMF_ConfigGetAttribute (cfg, self%point_emissions_srcfilen, &
                                   label='point_emissions_srcfilen:', default='/dev/null', __RC__)
@@ -814,9 +813,8 @@ subroutine Run1 (GC, import, export, clock, RC)
 
 !   Set du_src to 0 where undefined
 !   --------------------------------
-    if (associated(du_src)) then
-       where (1.01*du_src > MAPL_UNDEF) du_src = 0.
-    endif
+    where (1.01*du_src > MAPL_UNDEF) du_src = 0.
+
 !   Get dimensions
 !   ---------------
     import_shape = shape(wet1)
@@ -978,7 +976,7 @@ subroutine Run2 (GC, import, export, clock, RC)
 
     integer                           :: n
     real, allocatable, dimension(:,:) :: drydepositionfrequency, dqa
-    real                              :: fwet
+    real, pointer, dimension(:,:,:)   :: dusd_vel
     logical                           :: KIN
 
     integer                           :: i1, j1, i2, j2, km
@@ -1039,9 +1037,11 @@ subroutine Run2 (GC, import, export, clock, RC)
     do n = 1, self%nbins
        nullify(flux_ptr)
        if (associated(DUSD)) flux_ptr => DUSD(:,:,n)
+       nullify(dusd_vel)
+       if (associated(DUSD_V)) dusd_vel => DUSD_V(:,:,:,n)
        call Chem_SettlingSimple (self%km, self%klid, self%diag_Mie, n, self%cdt, MAPL_GRAV, &
                            DU(:,:,:,n), t, airdens, &
-                           rh2, zle, delp, flux_ptr, correctionMaring=self%maringFlag, &
+                           rh2, zle, delp, flux_ptr, dusd_vel, correctionMaring=self%maringFlag, &
                            settling_scheme=settling_opt, __RC__)
     end do
 
@@ -1070,9 +1070,8 @@ subroutine Run2 (GC, import, export, clock, RC)
    select case (self%wet_removal_scheme)
    case ('gocart')
       do n = 1, self%nbins
-         fwet = 1.0
          call WetRemovalGOCART2G(self%km, self%klid, self%nbins, self%nbins, n, self%cdt, 'dust', &
-                                 KIN, MAPL_GRAV, fwet, DU(:,:,:,n), ple, t, airdens, &
+                                 KIN, MAPL_GRAV, self%fwet(n), DU(:,:,:,n), ple, t, airdens, &
                                  pfl_lsan, pfi_lsan, cn_prcp, ncn_prcp, DUWT, __RC__)
       end do
    case ('ufs')

ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc

@@ -62,6 +62,7 @@ category: EXPORT
  DUMASS        | kg kg-1    | xyz  | C    |                                | Dust Mass Mixing Ratio
  DUMASS25      | kg kg-1    | xyz  | C    |                                | Dust Mass Mixing Ratio
  DUCONC        | kg m-3     | xyz  | C    |                                | Dust Mass Concentration
+ DUSD_V        | m s-1      | xyz  | C    | self%nbins                     | Dust Settling Velocity (Bin %d)
  DUEXTCOEF     | m-1        | xyz  | C    | size(self%wavelengths_profile) | Dust Extinction Coefficient
  DUEXTCOEFRH20 | m-1        | xyz  | C    | size(self%wavelengths_profile) | Dust Extinction Coefficient - Fixed RH=20%
  DUEXTCOEFRH80 | m-1        | xyz  | C    | size(self%wavelengths_profile) | Dust Extinction Coefficient - Fixed RH=80%

ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_instance_DU.rc

@@ -47,6 +47,9 @@ wet_removal_scheme: gocart ! default value
 # Scavenging efficiency per bin [km-1]
 fscav: 0.2  0.2  0.2  0.2  0.2
 
+# Large scale rainout efficiency per bin for wet_removal_scheme == gocart
+fwet: 1.0 1.0 1.0 1.0 1.0
+
 # Rainout efficiency per bin for wet_removal_scheme == ufs
 fwet_ice: 0.8 0.8 0.8 1.0 1.0
 fwet_snow: 0.8 0.8 0.8 1.0 1.0
@@ -75,4 +78,4 @@ drag_partition_option: 2
 
 # SettlingSolver options
 # Options: 'gocart' or 'ufs'
-settling_scheme: 'gocart'
+settling_scheme: 'gocart'