Skip to content

Commit 3cb1566

Browse files
authored
Merge pull request #356 from GEOS-ESM/feature/pchakrab/port-gocart-to-mapl3
Porting GOCART2G to MAPL3 (exercising only one child SS2G)
2 parents b9ec2f3 + 9ee973f commit 3cb1566

File tree

8 files changed

+3028
-3434
lines changed

8 files changed

+3028
-3434
lines changed

ESMF/GOCART2G_GridComp/CMakeLists.txt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,35 @@ set (alldirs
77
# CA2G_GridComp
88
# NI2G_GridComp
99
# SU2G_GridComp
10-
)
10+
)
1111

1212
set (srcs
1313
GOCART2G_GridCompMod.F90
14-
)
14+
)
1515

1616
set (resource_files
17-
GOCART2G_GridComp.rc
18-
)
17+
GOCART2G_GridComp.yaml
18+
)
1919

2020
install( FILES ${resource_files}
21-
DESTINATION etc
22-
)
21+
DESTINATION etc
22+
)
2323

24-
set (dependencies MAPL Chem_Shared2G Process_Library ESMF::ESMF)
24+
set (dependencies Chem_Shared2G Process_Library ESMF::ESMF)
2525
esma_add_library (${this}
2626
SRCS ${srcs}
2727
SUBCOMPONENTS ${alldirs}
2828
DEPENDENCIES ${dependencies}
29-
)
29+
TYPE SHARED
30+
)
3031

31-
mapl_acg (${this} GOCART2G_StateSpecs.rc
32-
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
33-
GET_POINTERS DECLARE_POINTERS)
32+
mapl_acg (
33+
${this} GOCART2G_StateSpecs.rc
34+
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS GET_POINTERS DECLARE_POINTERS
35+
3g
36+
)
3437

3538
# CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280
3639
if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG")
37-
target_link_libraries(${this} PRIVATE OpenMP::OpenMP_Fortran)
40+
target_link_libraries(${this} PRIVATE OpenMP::OpenMP_Fortran)
3841
endif ()
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
# Optics parameters
3+
wavelengths_for_profile_aop_in_nm: 550 # must be included in LUT
4+
wavelengths_for_vertically_integrated_aop_in_nm: 550 # must be included in LUT
5+
aerosol_monochromatic_optics_wavelength_in_nm_from_LUT: [470, 550, 670, 870]
6+
7+
ACTIVE_INSTANCES:
8+
DU: [DU] # [DU.data]
9+
SS: [SS] # [SS.data]
10+
SU: [SU] # [SU.data]
11+
CA: [CA.oc, CA.bc, CA.br] # [CA.oc.data, CA.bc.data]
12+
NI: [NI] # [NI.data]
13+
14+
PASSIVE_INSTANCES:
15+
DU: []
16+
SS: []
17+
SU: []
18+
CA: []
19+
NI: []
20+
21+
mapl:
22+
23+
misc:
24+
activate_all_imports: true
25+
activate_all_exports: true
26+
restart:
27+
import: true
28+
checkpoint:
29+
export: true
30+
import: true

0 commit comments

Comments
 (0)