Skip to content

Commit dd6b5e8

Browse files
mathomp4mathomp4
committed
Merge branch 'develop' into release/MAPL-v3
2 parents 2948653 + 6195266 commit dd6b5e8

File tree

3 files changed

+126
-5
lines changed

3 files changed

+126
-5
lines changed

‎GEOSdataatm_GridComp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ esma_add_library (${this}
1111
target_compile_definitions (${this} PRIVATE USE_CICE USE_R8)
1212

1313
install(
14-
FILES CORE_NYF_Data_AtmForcings_ExtData.yaml
14+
FILES JRA55-DO_DataAtm_Forcings_ExtData.yaml CORE_NYF_Data_AtmForcings_ExtData.yaml
1515
DESTINATION etc
1616
)

‎GEOSdataatm_GridComp/GEOS_DataAtmGridComp.F90‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ subroutine SetServices ( GC, RC )
202202
LONG_NAME = 'surface_temperature', &
203203
UNITS = 'K', &
204204
DIMS = MAPL_DimsHorzOnly, &
205+
DEFAULT = -1000.0, &
205206
VLOCATION = MAPL_VLocationNone, __RC__)
206207

207208
call MAPL_AddInternalSpec(GC, &
@@ -424,6 +425,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
424425
real, dimension(:,:), pointer :: ALW, BLW, SPEED, DISCHARGE, rPCU, rPLS, sSNO
425426
real, dimension(:,:), pointer :: CT, CQ, CM, SH, EVAP, TAUX, TAUY, Tskin, lwdnsrf
426427
real, dimension(:,:), pointer :: DRPARN, DFPARN, DRNIRN, DFNIRN, DRUVRN, DFUVRN
428+
real, dimension(:,:), pointer :: DSH, DEVAP
427429
real, dimension(:,:), pointer :: EMISSRF
428430

429431
real, allocatable, dimension(:,:) :: ZTH
@@ -479,7 +481,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
479481
! real LATSO, LONSO
480482

481483
real, parameter :: HW_hack = 2.
482-
logical :: firsttime = .true.
484+
logical :: firsttime = .false.
483485

484486
real :: TAU_TS
485487
real :: DT
@@ -614,11 +616,13 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
614616
call SetVarToZero('DEWL', __RC__)
615617
call SetVarToZero('FRSL', __RC__)
616618

619+
call MAPL_GetPointer(SurfImport, DSH, 'DSH', __RC__)
620+
call MAPL_GetPointer(SurfImport, DEVAP, 'DEVAP', __RC__)
617621
! these should be set to 0 (for now)
618-
call SetVarToZero('DSH', __RC__)
622+
!call SetVarToZero('DSH', __RC__)
619623
call SetVarToZero('DFU', __RC__)
620624
call SetVarToZero('DFV', __RC__)
621-
call SetVarToZero('DEVAP', __RC__)
625+
!call SetVarToZero('DEVAP', __RC__)
622626
call SetVarToZero('DDEWL', __RC__)
623627
call SetVarToZero('DFRSL', __RC__)
624628

@@ -658,7 +662,10 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
658662
!------------------------------------------------------
659663

660664
call ESMF_ClockGet(CLOCK, TIMESTEP=DELT, __RC__)
661-
DELT = DELT * NINT((86400./DT)) ! emulate daily Solar
665+
! the line below only works for daily forcing e..g. CORE I
666+
! for JRA55-DO or any dataset at higher frequency, this line makes SW much
667+
! higher than what data prescribed
668+
!DELT = DELT * NINT((86400./DT)) ! emulate daily Solar
662669

663670
call MAPL_SunGetInsolation(LONS, LATS, &
664671
ORBIT, ZTH, SLR, &
@@ -716,6 +723,10 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
716723
call MAPL_GetPointer(SurfImport, ALW, 'ALW', __RC__)
717724
call MAPL_GetPointer(SurfImport, BLW, 'BLW', __RC__)
718725

726+
if(any(Tskin<0.0)) then !only when DATAATM restart is bootstrapped
727+
firsttime = .true.
728+
end if
729+
719730
if (firsttime) then
720731
firsttime = .false.
721732
Tskin = TA
@@ -773,6 +784,10 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
773784
TAUX = CM * (Uskin - Uair)
774785
TAUY = CM * (Vskin - Vair)
775786

787+
! these derivatives are important for sea ice
788+
DSH = CT !* MAPL_CP (MAPL_CP got multiplied in Surf)
789+
DEVAP = CQ
790+
776791
101 format (A, e20.12, 3I3.2)
777792

778793
!!! if (mapl_am_i_root()) PRINT*, __FILE__, __LINE__

‎GEOSdataatm_GridComp/JRA55-DO_DataAtm_Forcings_ExtData.yaml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
Collections:
2+
psl_1_5_0:
3+
template: ExtData/JRA55-DO/v1-5-0/psl/psl_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010000-%y412312100.nc
4+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
5+
psl_1_5_0_1:
6+
template: ExtData/JRA55-DO/v1-5-0-1/psl/psl_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010000-%y412312100.nc
7+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
8+
tas_1_5_0:
9+
template: ExtData/JRA55-DO/v1-5-0/tas/tas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010000-%y412312100.nc
10+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
11+
tas_1_5_0_1:
12+
template: ExtData/JRA55-DO/v1-5-0-1/tas/tas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010000-%y412312100.nc
13+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
14+
huss_1_5_0:
15+
template: ExtData/JRA55-DO/v1-5-0/huss/huss_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010000-%y412312100.nc
16+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
17+
huss_1_5_0_1:
18+
template: ExtData/JRA55-DO/v1-5-0-1/huss/huss_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010000-%y412312100.nc
19+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
20+
uas_1_5_0:
21+
template: ExtData/JRA55-DO/v1-5-0/uas/uas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010000-%y412312100.nc
22+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
23+
uas_1_5_0_1:
24+
template: ExtData/JRA55-DO/v1-5-0-1/uas/uas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010000-%y412312100.nc
25+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
26+
vas_1_5_0:
27+
template: ExtData/JRA55-DO/v1-5-0/vas/vas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010000-%y412312100.nc
28+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
29+
vas_1_5_0_1:
30+
template: ExtData/JRA55-DO/v1-5-0-1/vas/vas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010000-%y412312100.nc
31+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
32+
uvas_1_5_0:
33+
template: ExtData/JRA55-DO/v1-5-0/uvas/uvas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010000-%y412312100.nc
34+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
35+
uvas_1_5_0_1:
36+
template: ExtData/JRA55-DO/v1-5-0-1/uvas/uvas_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010000-%y412312100.nc
37+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
38+
friver_1_5_0:
39+
template: ExtData/JRA55-DO/v1-5-0/friver/friver_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y40101-%y41231.nc
40+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
41+
friver_1_5_0_1:
42+
template: ExtData/JRA55-DO/v1-5-0-1/friver/friver_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y40101-%y41231.nc
43+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
44+
prra_1_5_0:
45+
template: ExtData/JRA55-DO/v1-5-0/prra/prra_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010130-%y412312230.nc
46+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
47+
prra_1_5_0_1:
48+
template: ExtData/JRA55-DO/v1-5-0-1/prra/prra_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010130-%y412312230.nc
49+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
50+
prsn_1_5_0:
51+
template: ExtData/JRA55-DO/v1-5-0/prsn/prsn_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010130-%y412312230.nc
52+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
53+
prsn_1_5_0_1:
54+
template: ExtData/JRA55-DO/v1-5-0-1/prsn/prsn_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010130-%y412312230.nc
55+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
56+
rlds_1_5_0:
57+
template: ExtData/JRA55-DO/v1-5-0/rlds/rlds_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010130-%y412312230.nc
58+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
59+
rlds_1_5_0_1:
60+
template: ExtData/JRA55-DO/v1-5-0-1/rlds/rlds_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010130-%y412312230.nc
61+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
62+
rsds_1_5_0:
63+
template: ExtData/JRA55-DO/v1-5-0/rsds/rsds_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0_gr_%y401010130-%y412312230.nc
64+
valid_range: "1958-01-01T00:00:00/2020-01-01T00:00:00"
65+
rsds_1_5_0_1:
66+
template: ExtData/JRA55-DO/v1-5-0-1/rsds/rsds_input4MIPs_atmosphericState_OMIP_MRI-JRA55-do-1-5-0-1_gr_%y401010130-%y412312230.nc
67+
valid_range: "2020-01-01T00:00:00/2024-02-02T00:00:00"
68+
69+
Samplings:
70+
interannual_sample:
71+
flux_conserve_sample:
72+
time_interpolation: false
73+
update_offset: "PT1H30M"
74+
river_conserve_sample:
75+
time_interpolation: false
76+
update_offset: "PT12H"
77+
78+
Exports:
79+
PS:
80+
- {starting: "1958-01-01T00:00:00", collection: psl_1_5_0, sample: interannual_sample, variable: psl}
81+
- {starting: "2020-01-01T00:00:00", collection: psl_1_5_0_1, sample: interannual_sample, variable: psl}
82+
TA:
83+
- {starting: "1958-01-01T00:00:00", collection: tas_1_5_0, sample: interannual_sample, variable: tas}
84+
- {starting: "2020-01-01T00:00:00", collection: tas_1_5_0_1, sample: interannual_sample, variable: tas}
85+
QA:
86+
- {starting: "1958-01-01T00:00:00", collection: huss_1_5_0, sample: interannual_sample, variable: huss}
87+
- {starting: "2020-01-01T00:00:00", collection: huss_1_5_0_1, sample: interannual_sample, variable: huss}
88+
UA;VA:
89+
- {starting: "1958-01-01T00:00:00", collection: uvas_1_5_0, sample: interannual_sample, variable: uas;vas}
90+
- {starting: "2020-01-01T00:00:00", collection: uvas_1_5_0_1, sample: interannual_sample, variable: uas;vas}
91+
RUNOFF:
92+
- {starting: "1958-01-01T00:00:00", collection: friver_1_5_0, regrid: CONSERVE, sample: river_conserve_sample, variable: friver}
93+
- {starting: "2020-01-01T00:00:00", collection: friver_1_5_0_1, regrid: CONSERVE, sample: river_conserve_sample, variable: friver}
94+
PCU:
95+
- {starting: "1958-01-01T00:00:00", collection: prra_1_5_0, regrid: CONSERVE, sample: flux_conserve_sample, variable: prra}
96+
- {starting: "2020-01-01T00:00:00", collection: prra_1_5_0_1, regrid: CONSERVE, sample: flux_conserve_sample, variable: prra}
97+
PLS: {collection: /dev/null}
98+
SNO:
99+
- {starting: "1958-01-01T00:00:00", collection: prsn_1_5_0, regrid: CONSERVE, sample: flux_conserve_sample, variable: prsn}
100+
- {starting: "2020-01-01T00:00:00", collection: prsn_1_5_0_1, regrid: CONSERVE, sample: flux_conserve_sample, variable: prsn}
101+
LWDN:
102+
- {starting: "1958-01-01T00:00:00", collection: rlds_1_5_0, regrid: CONSERVE, sample: flux_conserve_sample, variable: rlds}
103+
- {starting: "2020-01-01T00:00:00", collection: rlds_1_5_0_1, regrid: CONSERVE, sample: flux_conserve_sample, variable: rlds}
104+
SWGDWN:
105+
- {starting: "1958-01-01T00:00:00", collection: rsds_1_5_0, regrid: CONSERVE, sample: flux_conserve_sample, variable: rsds}
106+
- {starting: "2020-01-01T00:00:00", collection: rsds_1_5_0_1, regrid: CONSERVE, sample: flux_conserve_sample, variable: rsds}

0 commit comments

Comments
 (0)