Skip to content

Commit 268ece2

Browse files
pchakrabortypchakraborty
committed
Using named variable for ungridded dims
1 parent 17bf4b0 commit 268ece2

File tree

3 files changed

+209
-119
lines changed

3 files changed

+209
-119
lines changed

‎ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ module GOCART2G_GridCompMod
2121
use mapl3g_VerticalStaggerLoc, only: VERTICAL_STAGGER_NONE, VERTICAL_STAGGER_CENTER, VERTICAL_STAGGER_EDGE
2222
use mapl3g_State_API, only: MAPL_StateGetPointer
2323
use mapl3g_Geom_API, only: MAPL_GridGet
24+
use mapl3g_UngriddedDim, only: UngriddedDim
2425
use pflogger, only: logger_t => logger
2526

2627
use Chem_AeroGeneric
@@ -106,6 +107,7 @@ subroutine SetServices(gc, rc)
106107
! logical :: use_threads
107108
class(logger_t), pointer :: logger
108109
character(len=:), allocatable :: child_item_names
110+
type(UngriddedDim) :: ungrd_wavelengths_profile, ungrd_wavelengths_vertint
109111
integer :: iter, status
110112

111113
call MAPL_GridCompGet(gc, logger=logger, _RC)
@@ -128,6 +130,16 @@ subroutine SetServices(gc, rc)
128130
call MAPL_GridCompGetResource(gc, "aerosol_monochromatic_optics_wavelength_in_nm_from_LUT", wavelengths_diagmie, _RC)
129131
! call MAPL_GridCompGetResource(gc, "use_threads", use_threads, default=.false., _RC)
130132

133+
! Defined UngriddedDim items
134+
ungrd_wavelengths_profile = UngriddedDim( &
135+
size(self%wavelengths_profile), &
136+
name="wavelengths_profile", &
137+
units="nm")
138+
ungrd_wavelengths_vertint = UngriddedDim( &
139+
size(self%wavelengths_vertint), &
140+
name="wavelengths_vertint", &
141+
units="nm")
142+
131143
! ! Get my internal MAPL_Generic state
132144
! call MAPL_GetObjectFromGC (GC, MAPL, _RC)
133145
! ! set use_threads
@@ -543,7 +555,7 @@ subroutine Run2 (gc, import, export, clock, rc)
543555
! call ESMF_GridCompRun (gcs(i), importState=gim(i), exportState=gex(i), phase=3, clock=clock, _RC)
544556
! end if
545557
! end do
546-
call MAPL_GridCompRunChildren(gc, phase_name="Run0", _RC)
558+
! call MAPL_GridCompRunChildren(gc, phase_name="Run0", _RC)
547559

548560
! Get internal state
549561
call ESMF_UserCompGetInternalState(gc, 'GOCART_State', wrap, _RC)
@@ -668,7 +680,6 @@ subroutine Run2 (gc, import, export, clock, rc)
668680
! Sea Salt
669681
do n = 1, size(self%SS%instances)
670682
if ((self%SS%instances(n)%is_active) .and. (index(self%SS%instances(n)%name, 'data') == 0 )) then
671-
if(associated(totexttau)) totexttau(:,:,:) = totexttau(:,:,:) + ssexttau(:,:,:)
672683
if(associated(totexttau)) totexttau(:,:,:) = totexttau(:,:,:) + ssexttau(:,:,:)
673684
if(associated(totstexttau)) totstexttau(:,:,:) = totstexttau(:,:,:) + ssstexttau(:,:,:)
674685
if(associated(totscatau)) totscatau(:,:,:) = totscatau(:,:,:) + ssscatau(:,:,:)

‎ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc‎

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,63 +7,63 @@ category: IMPORT
77
#----------------------------------------------------------------------------------------
88
NAME | UNITS | DIMS | VLOC | RESTART | UNGRIDDED | LONG NAME
99
#----------------------------------------------------------------------------------------
10-
DELP | Pa | xyz | C | | | pressure_thickness
11-
# RH2 | 1 | xyz | C | | | Rel_Hum_after_moist
12-
AIRDENS | kg/m^3 | xyz | C | OPT | | moist_air_density
13-
T | K | xyz | C | OPT | | air_temperature
14-
PLE | Pa | xyz | E | OPT | | air_pressure
10+
DELP | Pa | xyz | C | | | pressure_thickness
11+
# RH2 | 1 | xyz | C | | | Rel_Hum_after_moist
12+
AIRDENS | kg/m^3 | xyz | C | OPT | | moist_air_density
13+
T | K | xyz | C | OPT | | air_temperature
14+
PLE | Pa | xyz | E | OPT | | air_pressure
1515
#-imports-from-seasalt-
16-
SSEXTTAU | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth
17-
SSSTEXTTAU | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness
18-
SSSCATAU | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering
19-
SSSTSCATAU | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness Due to Scattering
20-
SSEXTCOEF | m-1 | xyz | C | SKIP | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient
21-
SSEXTCOEFRH20 | m-1 | xyz | C | SKIP | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient - Fixed RH=20%
22-
SSEXTCOEFRH80 | m-1 | xyz | C | SKIP | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient - Fixed RH=80%
23-
SSSCACOEF | m-1 | xyz | C | SKIP | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient
24-
SSSCACOEFRH20 | m-1 | xyz | C | SKIP | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient - Fixed RH=20%
25-
SSSCACOEFRH80 | m-1 | xyz | C | SKIP | size(self%wavelengths_profile) | Sea Salt Scattering Coefficient - Fixed RH=80%
26-
SSBCKCOEF | m-1 sr-1 | xyz | C | SKIP | size(self%wavelengths_profile) | Sea Salt Backscatter Coefficient
27-
SSEXTT25 | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5)
28-
SSSCAT25 | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
29-
SSEXTTFM | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0)
30-
SSSCATFM | 1 | xy | N | SKIP | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0)
31-
SSANGSTR | 1 | xy | N | SKIP | | Sea Salt Angstrom parameter [470-870 nm]
32-
SSSMASS | kg m-3 | xy | N | SKIP | | Sea Salt Surface Mass Concentration
33-
SSSMASS25 | kg m-3 | xy | N | SKIP | | Sea Salt Surface Mass Concentration of Particulate Matter < 2.5 microns (PM2.5)
16+
SSEXTTAU | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Aerosol Optical Depth
17+
SSSTEXTTAU | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Stratospheric Aerosol Optical Thickness
18+
SSSCATAU | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Aerosol Optical Depth Due to Scattering
19+
SSSTSCATAU | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Stratospheric Aerosol Optical Thickness Due to Scattering
20+
SSEXTCOEF | m-1 | xyz | C | SKIP | ungrd_wavelengths_profile | Sea Salt Extinction Coefficient
21+
SSEXTCOEFRH20 | m-1 | xyz | C | SKIP | ungrd_wavelengths_profile | Sea Salt Extinction Coefficient - Fixed RH=20%
22+
SSEXTCOEFRH80 | m-1 | xyz | C | SKIP | ungrd_wavelengths_profile | Sea Salt Extinction Coefficient - Fixed RH=80%
23+
SSSCACOEF | m-1 | xyz | C | SKIP | ungrd_wavelengths_profile | Sea Salt Scattering Coefficient
24+
SSSCACOEFRH20 | m-1 | xyz | C | SKIP | ungrd_wavelengths_profile | Sea Salt Scattering Coefficient - Fixed RH=20%
25+
SSSCACOEFRH80 | m-1 | xyz | C | SKIP | ungrd_wavelengths_profile | Sea Salt Scattering Coefficient - Fixed RH=80%
26+
SSBCKCOEF | m-1 sr-1 | xyz | C | SKIP | ungrd_wavelengths_profile | Sea Salt Backscatter Coefficient
27+
SSEXTT25 | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5)
28+
SSSCAT25 | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
29+
SSEXTTFM | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0)
30+
SSSCATFM | 1 | xy | N | SKIP | ungrd_wavelengths_vertint | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0)
31+
SSANGSTR | 1 | xy | N | SKIP | | Sea Salt Angstrom parameter [470-870 nm]
32+
SSSMASS | kg m-3 | xy | N | SKIP | | Sea Salt Surface Mass Concentration
33+
SSSMASS25 | kg m-3 | xy | N | SKIP | | Sea Salt Surface Mass Concentration of Particulate Matter < 2.5 microns (PM2.5)
3434

3535
category: EXPORT
3636
#----------------------------------------------------------------------------------------
3737
# VARIABLE | DIMENSIONS | Additional Metadata
3838
#----------------------------------------------------------------------------------------
39-
NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME
39+
NAME | UNITS | DIMS | VLOC | UNGRIDDED | LONG NAME
4040
#----------------------------------------------------------------------------------------
41-
PSO4TOT | kg m-2 s-1 | xyz | C | | Total Sulfate Produced in GOCART
41+
PSO4TOT | kg m-2 s-1 | xyz | C | | Total Sulfate Produced in GOCART
4242
#........................................................................................
43-
TOTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm
44-
TOTSTEXTTAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Stratospheric Aerosol Optical Thickness at 550 nm
45-
TOTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering
46-
TOTSTSCATAU | 1 | xy | N | size(self%wavelengths_vertint) | Total Stratospheric Aerosol Optical Thickness at 550 nm Due to Scattering
47-
TOTEXTT25 | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 2.5 microns (PM2.5)
48-
TOTSCAT25 | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
49-
TOTEXTTFM | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 1 micron (PM1.0)
50-
TOTSCATFM | 1 | xy | N | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 1 micron (PM1.0)
51-
TOTANGSTR | 1 | xy | N | | Total Aerosol Angstrom parameter [470-870 nm]
52-
TOTEXTCOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient
53-
TOTEXTCOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient - Fixed RH=20%
54-
TOTEXTCOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient - Fixed RH=80%
55-
TOTSCACOEF | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Scattering coefficient
56-
TOTSCACOEFRH20 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Scattering coefficient - Fixed RH=20%
57-
TOTSCACOEFRH80 | m-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Scattering coefficient - Fixed RH=80%
58-
TOTBCKCOEF | m-1 sr-1 | xyz | C | size(self%wavelengths_profile) | Total Aerosol Single Scattering Backscatter coefficient
59-
TOTABCKTOA | m-1 sr-1 | xyz | C | | Total Attenuated Backscatter Coefficient from TOA [532nm]
60-
TOTABCKSFC | m-1 sr-1 | xyz | C | | Total Attenuated Backscatter Coefficient from surface [532nm]
61-
PM | kg m-3 | xy | N | | Total Reconstructed Dry Particulate Matter
62-
PM_RH35 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter at 35% Relative Humidity
63-
PM_RH50 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter at 50% Relative Humidity
64-
PM25 | kg m-3 | xy | N | | Total Reconstructed Dry Particulate Matter < 2.5 microns (PM2.5)
65-
PM25_RH35 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 35% Relative Humidity
66-
PM25_RH50 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 50% Relative Humidity
43+
TOTEXTTAU | 1 | xy | N | ungrd_wavelengths_vertint | Total Aerosol Optical Depth at 550 nm
44+
TOTSTEXTTAU | 1 | xy | N | ungrd_wavelengths_vertint | Total Stratospheric Aerosol Optical Thickness at 550 nm
45+
TOTSCATAU | 1 | xy | N | ungrd_wavelengths_vertint | Total Aerosol Optical Depth at 550 nm Due to Scattering
46+
TOTSTSCATAU | 1 | xy | N | ungrd_wavelengths_vertint | Total Stratospheric Aerosol Optical Thickness at 550 nm Due to Scattering
47+
TOTEXTT25 | 1 | xy | N | ungrd_wavelengths_vertint | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 2.5 microns (PM2.5)
48+
TOTSCAT25 | 1 | xy | N | ungrd_wavelengths_vertint | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
49+
TOTEXTTFM | 1 | xy | N | ungrd_wavelengths_vertint | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 1 micron (PM1.0)
50+
TOTSCATFM | 1 | xy | N | ungrd_wavelengths_vertint | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 1 micron (PM1.0)
51+
TOTANGSTR | 1 | xy | N | | Total Aerosol Angstrom parameter [470-870 nm]
52+
TOTEXTCOEF | m-1 | xyz | C | ungrd_wavelengths_profile | Total Aerosol Extinction coefficient
53+
TOTEXTCOEFRH20 | m-1 | xyz | C | ungrd_wavelengths_profile | Total Aerosol Extinction coefficient - Fixed RH=20%
54+
TOTEXTCOEFRH80 | m-1 | xyz | C | ungrd_wavelengths_profile | Total Aerosol Extinction coefficient - Fixed RH=80%
55+
TOTSCACOEF | m-1 | xyz | C | ungrd_wavelengths_profile | Total Aerosol Scattering coefficient
56+
TOTSCACOEFRH20 | m-1 | xyz | C | ungrd_wavelengths_profile | Total Aerosol Scattering coefficient - Fixed RH=20%
57+
TOTSCACOEFRH80 | m-1 | xyz | C | ungrd_wavelengths_profile | Total Aerosol Scattering coefficient - Fixed RH=80%
58+
TOTBCKCOEF | m-1 sr-1 | xyz | C | ungrd_wavelengths_profile | Total Aerosol Single Scattering Backscatter coefficient
59+
TOTABCKTOA | m-1 sr-1 | xyz | C | | Total Attenuated Backscatter Coefficient from TOA [532nm]
60+
TOTABCKSFC | m-1 sr-1 | xyz | C | | Total Attenuated Backscatter Coefficient from surface [532nm]
61+
PM | kg m-3 | xy | N | | Total Reconstructed Dry Particulate Matter
62+
PM_RH35 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter at 35% Relative Humidity
63+
PM_RH50 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter at 50% Relative Humidity
64+
PM25 | kg m-3 | xy | N | | Total Reconstructed Dry Particulate Matter < 2.5 microns (PM2.5)
65+
PM25_RH35 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 35% Relative Humidity
66+
PM25_RH50 | kg m-3 | xy | N | | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 50% Relative Humidity
6767

6868
category: INTERNAL
6969
#----------------------------------------------------------------------------------------
@@ -101,5 +101,3 @@ category: INTERNAL
101101
# E | VLOC | MAPL_VlocationEdge
102102
# N | VLOC | MAPL_VlocationNone
103103
#--------------------------------------------
104-
105-

0 commit comments

Comments
 (0)