Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/wdboggs/use acg #6

Merged
merged 35 commits into from
Dec 22, 2022
Merged

Feature/wdboggs/use acg #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9616a5c
Create ACG StateSpecs file for GEOS_OceanGridComp.F90
darianboggs Jun 10, 2022
229572c
Create .h include files; Replace MAPL_AddSpec calls with #include lines
darianboggs Jun 10, 2022
2712ea6
Add include statements for GetPointer and pointer declarations; Updat…
darianboggs Jun 10, 2022
e0df5ab
Removed MASKO from GEOS_Ocean_StateSpecs.rc because it should be trea…
darianboggs Jun 10, 2022
aa41bd0
Remove MAPL_AddSpec calls with CHILD_ID field @sanAkel
darianboggs Jun 10, 2022
7780f5c
Restore MAPL_AddSpec calls, pointer declarations, and MAPL_GetPointer…
darianboggs Jun 10, 2022
30728cb
Remove .h files from index
darianboggs Jun 10, 2022
30474b6
Add # to comment out the CHILD_ID exports column lines
darianboggs Jun 10, 2022
13f55e0
Update names of DeclarePointer and GetPointer include filenames
darianboggs Jun 13, 2022
af0dedb
Create MOM and MOM6 spec files. They need to be checked. @sanAkel
darianboggs Jun 13, 2022
f80671c
Eliminate commented out lines
darianboggs Jun 15, 2022
8926c42
Delete commented out MAPL_AddSpec calls; restore pointer declarations…
darianboggs Jun 15, 2022
7556568
Merge branch 'develop' into feature/wdboggs/use_ACG
sanAkel Jul 1, 2022
a6c74d0
Merge branch 'develop' into feature/wdboggs/use_ACG
sanAkel Oct 11, 2022
f9eb843
Merge branch 'develop' into feature/wdboggs/use_ACG
sanAkel Dec 15, 2022
61a637d
Back off ACG since it crashed and start: one-by-one
sanAkel Dec 19, 2022
9b135e0
fix syntax for override and NOTE: versosity level is set to 2, can go…
sanAkel Dec 19, 2022
03c05d8
Introduce ACG elements
sanAkel Dec 20, 2022
47559bf
Introduce ACG elements
sanAkel Dec 20, 2022
6481e4d
1. Clean up, 2. Introduce ACG- start with 2 variables, 3. Rename FI t…
sanAkel Dec 20, 2022
24b6b84
Data Sea: add all imports and exports to the state spec resource file…
sanAkel Dec 20, 2022
3c9f3bf
clean up
sanAkel Dec 21, 2022
ee53be5
Add ACG bits to CMakeLists.txt and doc in spec file
sanAkel Dec 21, 2022
7d69d96
Get rid of quotes and trailing blanks, former are WRONG-- in the sens…
sanAkel Dec 21, 2022
c54cba4
Eliminate import/export spec and clean up
sanAkel Dec 21, 2022
0019295
1. More cleaning, 2. Rename MASK so as to work with ACG code. NOTE: M…
sanAkel Dec 21, 2022
7f610b5
Cull out dummy exports- as much as possible. There are a few that are…
sanAkel Dec 22, 2022
8a3f5be
SWHEAT is not used, it is a DUMMY import. It is there only because of…
sanAkel Dec 22, 2022
58ac8f2
Add ACG bits
sanAkel Dec 22, 2022
bf2c742
Remove quotes- they should NOT be there.
sanAkel Dec 22, 2022
3071e1b
1. Remove TAB spaces, 2. SetServices uses barebones ACG: import and e…
sanAkel Dec 22, 2022
4beffaa
Add call to ESMF_GridCompGet
sanAkel Dec 22, 2022
09fa602
Add optional arg when replay is active and restarts (doRecord) are as…
sanAkel Dec 22, 2022
e34ca4d
Remove blank space
sanAkel Dec 22, 2022
57499da
1. Major clean up, 2. Introduce AGC import and export spec in setServ…
sanAkel Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ esma_add_library (${this}
SRCS GEOS_OceanGridComp.F90
SUBCOMPONENTS MOM6_GEOSPlug MOM_GEOS5PlugMod GEOSdatasea_GridComp
DEPENDENCIES GEOSdatasea_GridComp MAPL esmf)

mapl_acg (${this} GEOS_Ocean_StateSpecs.rc
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
GET_POINTERS DECLARE_POINTERS)
908 changes: 207 additions & 701 deletions GEOS_OceanGridComp.F90
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 64 additions & 0 deletions GEOS_Ocean_StateSpecs.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
schema_version: 2.0.0
component: Ocean

category: IMPORT
#---------------------------------------------------------------------------------------------------------------------
# VARIABLE | DIMENSIONS | Additional Metadata
#---------------------------------------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | COND | DATATYPE | LONG_NAME
#---------------------------------------------------------------------------------------------------------------------
FROCEAN | 1 | xy | N | | | fraction_of_gridbox_covered_by_ocean
TAUX | N m-2 | xy | N | | | Agrid_eastward_stress_on_ocean
TAUY | N m-2 | xy | N | | | Agrid_northward_stress_on_ocean
PENUVR | W m-2 | xy | N | | | net_downward_penetrating_direct_UV_flux
PENPAR | W m-2 | xy | N | | | net_downward_penetrating_direct_PAR_flux
PENUVF | W m-2 | xy | N | | | net_downward_penetrating_diffuse_UV_flux
PENPAF | W m-2 | xy | N | | | net_downward_penetrating_diffuse_PAR_flux
DRNIR | W m-2 | xy | N | | | net_surface_downwelling_nir_beam_flux
DFNIR | W m-2 | xy | N | | | net_surface_downwelling_nir_diffuse_flux
SWHEAT | W m-2 | xyz | C | | | solar_heating_rate
DISCHARGE | kg m-2 s-1 | xy | N | | | river_discharge_at_ocean_points
TR | 1 | xyz | C | trim(OCEAN_NAME) == 'MOM' | MAPL_BundleItem | tracer_mixing_ratios
TRFLUX | X | xy | N | trim(OCEAN_NAME) == 'MOM' | MAPL_BundleItem | surface_fluxes_of_tracers
LWFLX | W m-2 | xy | N | | | surface_net_downward_longwave_flux
SHFLX | W m-2 | xy | N | | | upward_sensible_heat_flux
QFLUX | kg m-2 s-1 | xy | N | | | evaporation
SNOW | kg m-2 s-1 | xy | N | | | ocean_snowfall
RAIN | kg m-2 s-1 | xy | N | | | ocean_rainfall
FRESH | kg m-2 s-1 | xy | N | | | fresh_water_flux_due_to_ice_dynamics
FSALT | kg m-2 s-1 | xy | N | | | salt_flux_due_to_ice_dynamics
FHOCN | W m-2 | xy | N | | | heat_flux_due_to_ice_dynamics
PEN_OCN | W m-2 | xy | N | | | penetrated_shortwave_flux_at_the_bottom_of_first_ocean_model_layer
FRACICEd | 1 | xy | N | dual_ocean | | fractional_cover_of_seaice

category: INTERNAL
#---------------------------------------------------------------------------------------------
# VARIABLE | DIMENSIONS | Additional Metadata
#---------------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | FRIENDLYTO | DEFAULT | LONG_NAME
#---------------------------------------------------------------------------------------------
TS_FOUND | K | xy | N | trim(COMP_NAME) | 280.0 | foundation_temperature_for_interface_layer

category: EXPORT
#---------------------------------------------------------------------------------------------
# VARIABLE | DIMENSIONS | Additional Metadata
#---------------------------------------------------------------------------------------------
NAME | UNITS | DIMS | VLOC | LONG_NAME
#---------------------------------------------------------------------------------------------
#MASKO | 1 | xy | N | ocean_mask
SS_FOUND | PSU | xy | N | foundation_salinity_for_interface_layer
FRZMLT | W m-2 | xy | N | freeze_melt_potential
TAUX | N m-2 | xy | N | Agrid_eastward_stress_on_ocean
TAUY | N m-2 | xy | N | Agrid_northward_stress_on_ocean
SWHEAT | W m-2 | xyz | C | solar_heating_rate
RFLUX | W m-2 | xy | N | downward_radiative_heat_flux_at_ocean_bottom
DISCHARGE | kg m-2 s-1 | xy | N | river_discharge_at_ocean_points
FROCEAN | 1 | xy | N | fraction_of_gridbox_covered_by_ocean
LWFLX | W m-2 | xy | N | surface_net_downward_longwave_flux
SWFLX | W m-2 | xy | N | surface_net_downward_shortwave_flux
SHFLX | W m-2 | xy | N | upward_sensible_heat_flux
QFLUX | kg m-2 s-1 | xy | N | evaporation
SFLX | kg m-2 s-1 | xy | N | salt_flux_due_to_ice_dynamics
RAIN | kg m-2 s-1 | xy | N | ocean_rainfall
SNOW | kg m-2 s-1 | xy | N | ocean_snowfall
PEN_OCN | W m-2 | xy | N | penetrated_shortwave_flux_at_the_bottom_of_first_ocean_model_layer
4 changes: 4 additions & 0 deletions GEOSdatasea_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
esma_set_this ()

esma_add_library (${this} SRCS GEOS_DataSeaGridComp.F90 DEPENDENCIES MAPL esmf NetCDF::NetCDF_Fortran)

mapl_acg (${this} GEOS_DataSea_StateSpecs.rc
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
GET_POINTERS DECLARE_POINTERS)
Loading