Skip to content

Commit 0222cea

Browse files
dustinswalesdustinswales
committed
Fix inconsistencies in metadata/fortran
1 parent 4ed7eec commit 0222cea

7 files changed

Lines changed: 20 additions & 126 deletions

File tree

‎physics/CONV/C3‎

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.meta‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,7 @@
462462
dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers)
463463
type = real
464464
kind = kind_phys
465-
<<<<<<< HEAD
466465
intent = out
467-
=======
468-
intent = in
469-
>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237
470466
[dusfc1]
471467
standard_name = instantaneous_surface_x_momentum_flux
472468
long_name = surface momentum flux in the x-direction valid for current call

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module GFS_rrtmgp_setup
1010
use module_ozphys, only : ty_ozphys
1111
implicit none
1212

13-
public GFS_rrtmgp_setup_init, GFS_rrtmgp_setup_timestep_init, GFS_rrtmgp_setup_finalize
13+
public GFS_rrtmgp_setup_init, GFS_rrtmgp_setup_timestep_init, GFS_rrtmgp_setup_final
1414

1515
private
1616

@@ -247,10 +247,10 @@ subroutine GFS_rrtmgp_setup_timestep_init (idate, jdate, deltsw, deltim, doSWrad
247247

248248
end subroutine GFS_rrtmgp_setup_timestep_init
249249

250-
!> \section arg_table_GFS_rrtmgp_setup_finalize Argument Table
251-
!! \htmlinclude GFS_rrtmgp_setup_finalize.html
250+
!> \section arg_table_GFS_rrtmgp_setup_final Argument Table
251+
!! \htmlinclude GFS_rrtmgp_setup_final.html
252252
!!
253-
subroutine GFS_rrtmgp_setup_finalize (errmsg, errflg)
253+
subroutine GFS_rrtmgp_setup_final (errmsg, errflg)
254254
character(len=*), intent( out) :: errmsg
255255
integer, intent( out) :: errflg
256256

@@ -263,5 +263,5 @@ subroutine GFS_rrtmgp_setup_finalize (errmsg, errflg)
263263
! do finalization stuff if needed
264264
is_initialized = .false.
265265

266-
end subroutine GFS_rrtmgp_setup_finalize
266+
end subroutine GFS_rrtmgp_setup_final
267267
end module GFS_rrtmgp_setup

‎physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta‎

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
11
########################################################################
22
[ccpp-table-properties]
3-
<<<<<<<< HEAD:physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.meta
4-
name = GFS_photochemistry_post
5-
========
63
name = mynnedmf_wrapper_post
7-
>>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237:physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta
84
type = scheme
95
dependencies = ../../hooks/machine.F,
106

117
########################################################################
128
[ccpp-arg-table]
13-
<<<<<<<< HEAD:physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.meta
14-
name = GFS_photochemistry_post_run
15-
type = scheme
16-
[tend_opt_photochem]
17-
standard_name = control_for_application_method_of_photochemistry_tendencies
18-
long_name = control for application method of photochemistry tendencies
19-
========
209
name = mynnedmf_wrapper_post_run
2110
type = scheme
2211
[tend_opt_pbl]
2312
standard_name = control_for_application_method_of_planetary_boundary_layer_tendencies
2413
long_name = control for application method of planetary boundary layer tendencies
25-
>>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237:physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta
2614
units = 1
2715
dimensions = ()
2816
type = integer
@@ -59,8 +47,6 @@
5947
[ten_t]
6048
standard_name = tendency_of_air_temperature
6149
long_name = tendency of air temperature calculated by one physics scheme
62-
<<<<<<<< HEAD:physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.meta
63-
========
6450
units = K s-1
6551
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
6652
type = real
@@ -138,93 +124,6 @@
138124
type = real
139125
kind = kind_phys
140126
intent = inout
141-
[dtdt]
142-
standard_name = process_split_cumulative_tendency_of_air_temperature
143-
long_name = tendency of the temperature
144-
>>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237:physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta
145-
units = K s-1
146-
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
147-
type = real
148-
kind = kind_phys
149-
<<<<<<<< HEAD:physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.meta
150-
intent = in
151-
[ten_u]
152-
standard_name = tendency_of_x_wind
153-
long_name = tendency of x wind calculated by one physics scheme
154-
========
155-
intent = inout
156-
[dudt]
157-
standard_name = process_split_cumulative_tendency_of_x_wind
158-
long_name = tendency of the x wind
159-
>>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237:physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta
160-
units = m s-2
161-
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
162-
type = real
163-
kind = kind_phys
164-
<<<<<<<< HEAD:physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.meta
165-
intent = in
166-
[ten_v]
167-
standard_name = tendency_of_y_wind
168-
long_name = tendency of y wind calculated by one physics scheme
169-
========
170-
intent = inout
171-
[dvdt]
172-
standard_name = process_split_cumulative_tendency_of_y_wind
173-
long_name = tendency of the y wind
174-
>>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237:physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta
175-
units = m s-2
176-
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
177-
type = real
178-
kind = kind_phys
179-
<<<<<<<< HEAD:physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.meta
180-
intent = in
181-
[ten_q]
182-
standard_name = tendency_of_tracer_concentration
183-
long_name = tendency of tracer concentration calculated by one physics scheme
184-
========
185-
intent = inout
186-
[dqdt]
187-
standard_name = process_split_cumulative_tendency_of_tracers
188-
long_name = tendency of the tracers due to model physics
189-
>>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237:physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta
190-
units = kg kg-1 s-1
191-
dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers)
192-
type = real
193-
kind = kind_phys
194-
<<<<<<<< HEAD:physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.meta
195-
intent = in
196-
[gt0]
197-
standard_name = air_temperature
198-
long_name = air temperature
199-
units = K
200-
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
201-
type = real
202-
kind = kind_phys
203-
intent = inout
204-
[gu0]
205-
standard_name = x_wind
206-
long_name = zonal wind
207-
units = m s-1
208-
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
209-
type = real
210-
kind = kind_phys
211-
intent = inout
212-
[gv0]
213-
standard_name = y_wind
214-
long_name = meridional wind
215-
units = m s-1
216-
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
217-
type = real
218-
kind = kind_phys
219-
intent = inout
220-
[gq0]
221-
standard_name = tracer_concentration
222-
long_name = tracer concentration
223-
units = kg kg-1
224-
dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers)
225-
type = real
226-
kind = kind_phys
227-
intent = inout
228127
[dtdt]
229128
standard_name = process_split_cumulative_tendency_of_air_temperature
230129
long_name = tendency of the temperature
@@ -256,8 +155,6 @@
256155
dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers)
257156
type = real
258157
kind = kind_phys
259-
========
260-
>>>>>>>> f922ca6a5545a2d490328fc04d8cbee9a3311237:physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.meta
261158
intent = inout
262159
[errmsg]
263160
standard_name = ccpp_error_message

‎physics/PBL/SATMEDMF/satmedmfvdif.meta‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
dimensions = ()
1515
type = logical
1616
intent = in
17-
intent = in
1817
[isatmedmf]
1918
standard_name = choice_of_scale_aware_TKE_moist_EDMF_PBL
2019
long_name = choice of scale-aware TKE moist EDMF PBL scheme

‎physics/SFC_Models/Lake/Flake/flake_driver.F90‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,14 +418,9 @@ module flake_driver_post
418418
use machine, only: kind_phys
419419
implicit none
420420
private
421-
public flake_driver_post_init, flake_driver_post_final, flake_driver_post_run
421+
public flake_driver_post_run
422422

423423
contains
424-
subroutine flake_driver_post_init()
425-
end subroutine flake_driver_post_init
426-
427-
subroutine flake_driver_post_final()
428-
end subroutine flake_driver_post_final
429424

430425
!> \section arg_table_flake_driver_post_run Argument Table
431426
!! \htmlinclude flake_driver_post_run.html

‎physics/SFC_Models/Lake/Flake/flake_driver.meta‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
dimensions = (horizontal_loop_extent)
183183
type = real
184184
kind = kind_phys
185-
intent = inout
185+
intent = in
186186
[snwdph]
187187
standard_name = surface_snow_thickness_water_equivalent_over_ice
188188
long_name = water equivalent snow depth over ice
@@ -423,6 +423,13 @@
423423
dimensions = ()
424424
type = integer
425425
intent = in
426+
[use_lake_model]
427+
standard_name = flag_for_using_lake_model
428+
long_name = flag indicating lake points using a lake model
429+
units = flag
430+
dimensions = (horizontal_loop_extent)
431+
type = integer
432+
intent = in
426433
[lakedepth]
427434
standard_name = lake_depth
428435
long_name = lake depth
@@ -462,31 +469,31 @@
462469
dimensions = (horizontal_loop_extent)
463470
type = real
464471
kind = kind_phys
465-
intent = out
472+
intent = inout
466473
[zm]
467474
standard_name = ocean_mixed_layer_thickness
468475
long_name = mixed layer thickness
469476
units = m
470477
dimensions = (horizontal_loop_extent)
471478
type = real
472479
kind = kind_phys
473-
intent = out
480+
intent = inout
474481
[tref]
475482
standard_name = reference_sea_surface_temperature
476483
long_name = reference/foundation temperature
477484
units = K
478485
dimensions = (horizontal_loop_extent)
479486
type = real
480487
kind = kind_phys
481-
intent = out
482-
[tfco]
488+
intent = inout
489+
[tsfco]
483490
standard_name = sea_surface_temperature
484491
long_name = sea surface temperature
485492
units = K
486493
dimensions = (horizontal_loop_extent)
487494
type = real
488495
kind = kind_phys
489-
intent = out
496+
intent = inout
490497
[errmsg]
491498
standard_name = ccpp_error_message
492499
long_name = error message for error handling in CCPP

0 commit comments

Comments
 (0)