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/mfmehari/data atm bug fix #1015

Merged
merged 4 commits into from
Oct 29, 2024
Merged

Feature/mfmehari/data atm bug fix #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
854a780
DataAtm bug fix
Oct 3, 2024
ad45d54
DataAtm update
Oct 3, 2024
481bb1a
.yaml file install
Oct 24, 2024
d6dfee7
Merge branch 'develop' into feature/mfmehari/DataAtm_bug_fix
sdrabenh Oct 28, 2024
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
18 changes: 10 additions & 8 deletions GEOS_GcmGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,15 +1308,17 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
result=GCM_INTERNAL_STATE%SURF_IMP, rc=status)
VERIFY_(STATUS)

!select TURBULENCE export
call MAPL_ExportStateGet(GEX, name='TURBULENCE', &
result=GCM_INTERNAL_STATE%TURB_EXP, rc=status)
VERIFY_(STATUS)
if(.not. DO_DATA_ATM4OCN) then
!select TURBULENCE export
call MAPL_ExportStateGet(GEX, name='TURBULENCE', &
result=GCM_INTERNAL_STATE%TURB_EXP, rc=status)
VERIFY_(STATUS)

!select SURFACE import
call MAPL_ImportStateGet(GC, import=import, name='TURBULENCE', &
result=GCM_INTERNAL_STATE%TURB_IMP, rc=status)
VERIFY_(STATUS)
!select TURBULENCE import
call MAPL_ImportStateGet(GC, import=import, name='TURBULENCE', &
result=GCM_INTERNAL_STATE%TURB_IMP, rc=status)
VERIFY_(STATUS)
endif

!select OCEAN export
call MAPL_ExportStateGet(GEX, name='OCEAN', &
Expand Down
4 changes: 4 additions & 0 deletions GEOSdataatm_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ esma_add_library (${this}

target_compile_definitions (${this} PRIVATE USE_CICE USE_R8)

install(
FILES CORE_NYF_Data_AtmForcings_ExtData.yaml
DESTINATION etc
)
27 changes: 27 additions & 0 deletions GEOSdataatm_GridComp/CORE_NYF_Data_AtmForcings_ExtData.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Collections:
slp: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/slp.clim.nc}
t_10: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/t_10_mod.clim.nc}
q_10: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/q_10_mod.clim.nc}
u_10: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/u_10_mod.clim.nc}
v_10: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/v_10_mod.clim.nc}
ncar_runoff: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/ncar_runoff.clim.nc}
ncar_precip: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/ncar_precip.clim.nc}
ncar_rad: {template: /discover/nobackup/mmehari/DATA/MODEL/dataAtm_forcing/CORE/NYF_v2.0/ncar_rad.clim.nc}

Samplings:
clim_sample:
extrapolation: clim

Exports:
PS: {collection: slp, sample: clim_sample, variable: SLP}
TA: {collection: t_10, sample: clim_sample, variable: T_10_MOD}
QA: {collection: q_10, sample: clim_sample, variable: Q_10_MOD}
UA: {collection: u_10, sample: clim_sample, variable: U_10_MOD}
VA: {collection: v_10, sample: clim_sample, variable: V_10_MOD}
RUNOFF: {collection: ncar_runoff, sample: clim_sample, variable: RUNOFF}
PCU: {collection: ncar_precip, sample: clim_sample, variable: RAIN}
PLS: {collection: ncar_precip, sample: clim_sample, variable: RAIN}
SNO: {collection: ncar_precip, sample: clim_sample, variable: SNOW}
LWDN: {collection: ncar_rad, sample: clim_sample, variable: LWDN_MOD}
SWGDWN: {collection: ncar_rad, sample: clim_sample, variable: SWDN_MOD}

2 changes: 1 addition & 1 deletion GEOSdataatm_GridComp/GEOS_DataAtmGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
SPEED = SQRT(Uair**2 + Vair**2)

IM = size(Uair, 1)
JM = size(Uair, 1)
JM = size(Uair, 2)
allocate(Uskin(IM,JM), Vskin(IM,JM), Qskin(IM,JM), swrad(IM,JM), __STAT__)

call MAPL_GetPointer(SurfImport, DZ, 'DZ', __RC__)
Expand Down