Skip to content
This repository was archived by the owner on Feb 10, 2023. It is now read-only.

Commit 2448bea

Browse files
committed
Removed VEGTYP and SOLTYP from HYDRO_ini call.
1 parent c2cf5dd commit 2448bea

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

WRFHydro_NUOPC_Gluecode.F90

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ module wrfhydro_nuopc_gluecode
9090
real(ESMF_KIND_R8), dimension(:,:,:), pointer :: farrayPtr => null()
9191
endtype WRFHYDRO_Field
9292

93-
type(WRFHYDRO_Field),dimension(42) :: WRFHYDRO_FieldList = (/ &
93+
type(WRFHYDRO_Field),dimension(44) :: WRFHYDRO_FieldList = (/ &
9494
WRFHYDRO_Field( & !(01)
9595
stdname='aerodynamic_roughness_length', units='m', &
9696
adImport=.FALSE.,adExport=.FALSE.), &
@@ -191,30 +191,36 @@ module wrfhydro_nuopc_gluecode
191191
stdname='soil_moisture_fraction_layer_4', units='kg m-2', &
192192
adImport=.TRUE.,adExport=.FALSE.), &
193193
WRFHYDRO_Field( & !(34)
194+
stdname='soil_porosity', units='1', &
195+
adImport=.FALSE.,adExport=.FALSE.), &
196+
WRFHYDRO_Field( & !(35)
194197
stdname='subsurface_runoff_amount', units='kg s-1 m-2', &
195198
adImport=.TRUE.,adExport=.TRUE.), &
196-
WRFHYDRO_Field( & !(35)
199+
WRFHYDRO_Field( & !(36)
197200
stdname='surface_runoff_amount', units='kg s-1 m-2', &
198201
adImport=.TRUE.,adExport=.TRUE.), &
199-
WRFHYDRO_Field( & !(36)
202+
WRFHYDRO_Field( & !(37)
200203
stdname='surface_snow_thickness', units='m', &
201204
adImport=.FALSE.,adExport=.TRUE.), &
202-
WRFHYDRO_Field( & !(37)
205+
WRFHYDRO_Field( & !(38)
203206
stdname='soil_temperature_layer_1', units='K', &
204207
adImport=.TRUE.,adExport=.TRUE.), &
205-
WRFHYDRO_Field( & !(38)
208+
WRFHYDRO_Field( & !(39)
206209
stdname='soil_temperature_layer_2', units='K', &
207210
adImport=.TRUE.,adExport=.TRUE.), &
208-
WRFHYDRO_Field( & !(39)
211+
WRFHYDRO_Field( & !(40)
209212
stdname='soil_temperature_layer_3', units='K', &
210213
adImport=.TRUE.,adExport=.TRUE.), &
211-
WRFHYDRO_Field( & !(40)
214+
WRFHYDRO_Field( & !(41)
212215
stdname='soil_temperature_layer_4', units='K', &
213216
adImport=.TRUE.,adExport=.TRUE.), &
214-
WRFHYDRO_Field( & !(41)
217+
WRFHYDRO_Field( & !(42)
218+
stdname='vegetation_type', units='1', &
219+
adImport=.FALSE.,adExport=.FALSE.), &
220+
WRFHYDRO_Field( & !(43)
215221
stdname='volume_fraction_of_total_water_in_soil', units='m3 m-3', &
216222
adImport=.FALSE.,adExport=.TRUE.), &
217-
WRFHYDRO_Field( & !(42)
223+
WRFHYDRO_Field( & !(44)
218224
stdname='water_surface_height_above_reference_datum', units='m', &
219225
adImport=.FALSE.,adExport=.TRUE.)/)
220226

@@ -416,7 +422,7 @@ subroutine wrfhydro_nuopc_ini(did,vm,clock,rc)
416422
! clm4
417423
call HYDRO_ini(ntime,did=did,ix0=1,jx0=1)
418424
else
419-
call HYDRO_ini(ntime,did,ix0=nx_local,jx0=ny_local,vegtyp=IVGTYP,soltyp=isltyp)
425+
call HYDRO_ini(ntime,did,ix0=nx_local,jx0=ny_local)
420426
endif
421427

422428
! Initialize the timestep from driver timestep passed to cap
@@ -756,6 +762,9 @@ subroutine copy_import_fields(did,importState, rc)
756762
CASE ('soil_moisture_fraction_layer_4')
757763
call NUOPC_CopyFieldToFarray(field=field,farray=rt_domain(did)%smc(:,:,4),rc=rc)
758764
if(ESMF_STDERRORCHECK(rc)) return ! bail out
765+
CASE ('soil_porosity')
766+
call NUOPC_CopyFieldToFarray(field=field,farray=rt_domain(did)%smcmax1,rc=rc)
767+
if(ESMF_STDERRORCHECK(rc)) return ! bail out
759768
CASE ('subsurface_runoff_amount')
760769
call NUOPC_CopyFieldToFarray(field=field,farray=rt_domain(did)%soldrain,rc=rc)
761770
if (ESMF_STDERRORCHECK(rc)) return
@@ -774,6 +783,9 @@ subroutine copy_import_fields(did,importState, rc)
774783
CASE ('soil_temperature_layer_4')
775784
call NUOPC_CopyFieldToFarray(field=field,farray=rt_domain(did)%stc(:,:,4),rc=rc)
776785
if(ESMF_STDERRORCHECK(rc)) return ! bail out
786+
CASE ('vegetation_type')
787+
call NUOPC_CopyFieldToFarray(field=field,farray=rt_domain(did)%vegtyp,rc=rc)
788+
if(ESMF_STDERRORCHECK(rc)) return ! bail out
777789
CASE DEFAULT
778790
call ESMF_LogWrite("WRFHYDRO: Field hookup missing. Skipping import copy: "//trim(fieldNameList(fieldIndex)), &
779791
ESMF_LOGMSG_WARNING)

0 commit comments

Comments
 (0)