From 4d01a0b5b13594175aeb8a0cd7a153307eadb471 Mon Sep 17 00:00:00 2001 From: Tim Leslie Date: Fri, 26 Oct 2012 21:33:41 +1100 Subject: [PATCH 1/2] mom-41 User array types rather than scalars as per function interface (patch via Stefan Petri) --- .../monin_obukhov/monin_obukhov.F90 | 9 +- src/path_names_shared | 88 +++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 src/path_names_shared diff --git a/src/atmos_param/monin_obukhov/monin_obukhov.F90 b/src/atmos_param/monin_obukhov/monin_obukhov.F90 index 41a740b420..07df545b41 100644 --- a/src/atmos_param/monin_obukhov/monin_obukhov.F90 +++ b/src/atmos_param/monin_obukhov/monin_obukhov.F90 @@ -859,14 +859,17 @@ subroutine mo_diff_0d_1(z, u_star, b_star, k_m, k_h) integer :: ni, nj, nk, ier real, parameter :: ustar_min = 1.e-10 +real, dimension(1,1) :: u_star1, b_star1 +real, dimension(1,1,1) :: z1, k_m1, k_h1 if(.not.module_is_initialized) call monin_obukhov_init ni = 1; nj = 1; nk = 1 +z1 = z; u_star1 = u_star; b_star1 = b_star call monin_obukhov_diff(vonkarm, & & ustar_min, & & neutral, stable_option, rich_crit, zeta_trans, & - & ni, nj, nk, z, u_star, b_star, k_m, k_h, ier) + & ni, nj, nk, z1, u_star1, b_star1, k_m1, k_h1, ier) end subroutine mo_diff_0d_1 @@ -880,14 +883,16 @@ subroutine mo_diff_0d_n(z, u_star, b_star, k_m, k_h) integer :: ni, nj, nk, ier real, parameter :: ustar_min = 1.e-10 +real, dimension(1,1) :: u_star1, b_star1 if(.not.module_is_initialized) call monin_obukhov_init ni = 1; nj = 1; nk = size(z(:)) +u_star1 = u_star; b_star1 = b_star call monin_obukhov_diff(vonkarm, & & ustar_min, & & neutral, stable_option, rich_crit, zeta_trans, & - & ni, nj, nk, z, u_star, b_star, k_m, k_h, ier) + & ni, nj, nk, z, u_star1, b_star1, k_m, k_h, ier) end subroutine mo_diff_0d_n diff --git a/src/path_names_shared b/src/path_names_shared new file mode 100644 index 0000000000..93d6cc2536 --- /dev/null +++ b/src/path_names_shared @@ -0,0 +1,88 @@ +shared/drifters/cloud_interpolator.F90 +shared/drifters/drifters.F90 +shared/drifters/drifters_comm.F90 +shared/drifters/drifters_compute_k.h +shared/drifters/drifters_core.F90 +shared/drifters/drifters_input.F90 +shared/drifters/drifters_io.F90 +shared/drifters/drifters_push.h +shared/drifters/drifters_set_field.h +shared/drifters/fms_switches.h +shared/drifters/quicksort.F90 +shared/exchange/stock_constants.F90 +shared/exchange/xgrid.F90 +shared/fms/fms.F90 +shared/fms/fms_io.F90 +shared/fms/read_data_2d.inc +shared/fms/read_data_3d.inc +shared/fms/read_data_4d.inc +shared/fms/write_data.inc +shared/mpp/mpp.F90 +shared/mpp/mpp_data.F90 +shared/mpp/mpp_domains.F90 +shared/mpp/mpp_io.F90 +shared/mpp/mpp_memutils.F90 +shared/mpp/mpp_parameter.F90 +shared/mpp/mpp_pset.F90 +shared/mpp/mpp_utilities.F90 +shared/mpp/nsclock.c +shared/mpp/threadloc.c +shared/mpp/include/mpp_chksum.h +shared/mpp/include/mpp_chksum_int.h +shared/mpp/include/mpp_chksum_scalar.h +shared/mpp/include/mpp_comm.inc +shared/mpp/include/mpp_comm_mpi.inc +shared/mpp/include/mpp_comm_nocomm.inc +shared/mpp/include/mpp_comm_sma.inc +shared/mpp/include/mpp_data_mpi.inc +shared/mpp/include/mpp_data_nocomm.inc +shared/mpp/include/mpp_data_sma.inc +shared/mpp/include/mpp_do_get_boundary.h +shared/mpp/include/mpp_do_global_field.h +shared/mpp/include/mpp_do_redistribute.h +shared/mpp/include/mpp_do_update.h +shared/mpp/include/mpp_do_updateV.h +shared/mpp/include/mpp_do_updateV_ad.h +shared/mpp/include/mpp_do_update_ad.h +shared/mpp/include/mpp_domains_comm.inc +shared/mpp/include/mpp_domains_define.inc +shared/mpp/include/mpp_domains_misc.inc +shared/mpp/include/mpp_domains_reduce.inc +shared/mpp/include/mpp_domains_util.inc +shared/mpp/include/mpp_error_a_a.h +shared/mpp/include/mpp_error_a_s.h +shared/mpp/include/mpp_error_s_a.h +shared/mpp/include/mpp_error_s_s.h +shared/mpp/include/mpp_get_boundary.h +shared/mpp/include/mpp_global_field.h +shared/mpp/include/mpp_global_reduce.h +shared/mpp/include/mpp_global_sum.h +shared/mpp/include/mpp_global_sum_ad.h +shared/mpp/include/mpp_global_sum_tl.h +shared/mpp/include/mpp_io_connect.inc +shared/mpp/include/mpp_io_misc.inc +shared/mpp/include/mpp_io_read.inc +shared/mpp/include/mpp_io_util.inc +shared/mpp/include/mpp_io_write.inc +shared/mpp/include/mpp_read_2Ddecomp.h +shared/mpp/include/mpp_reduce_mpi.h +shared/mpp/include/mpp_reduce_nocomm.h +shared/mpp/include/mpp_reduce_sma.h +shared/mpp/include/mpp_sum.inc +shared/mpp/include/mpp_sum_mpi.h +shared/mpp/include/mpp_sum_nocomm.h +shared/mpp/include/mpp_sum_sma.h +shared/mpp/include/mpp_transmit.inc +shared/mpp/include/mpp_transmit_mpi.h +shared/mpp/include/mpp_transmit_nocomm.h +shared/mpp/include/mpp_transmit_sma.h +shared/mpp/include/mpp_update_domains2D.h +shared/mpp/include/mpp_update_domains2D_ad.h +shared/mpp/include/mpp_util.inc +shared/mpp/include/mpp_util_mpi.inc +shared/mpp/include/mpp_util_nocomm.inc +shared/mpp/include/mpp_util_sma.inc +shared/mpp/include/mpp_write.h +shared/mpp/include/mpp_write_2Ddecomp.h +shared/mpp/include/system_clock.h + From 0de313e218909587175d89bc74c4c86092859c5a Mon Sep 17 00:00:00 2001 From: Tim Leslie Date: Fri, 26 Oct 2012 21:45:57 +1100 Subject: [PATCH 2/2] mom-41 Remove accidentally committed file --- src/path_names_shared | 88 ------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 src/path_names_shared diff --git a/src/path_names_shared b/src/path_names_shared deleted file mode 100644 index 93d6cc2536..0000000000 --- a/src/path_names_shared +++ /dev/null @@ -1,88 +0,0 @@ -shared/drifters/cloud_interpolator.F90 -shared/drifters/drifters.F90 -shared/drifters/drifters_comm.F90 -shared/drifters/drifters_compute_k.h -shared/drifters/drifters_core.F90 -shared/drifters/drifters_input.F90 -shared/drifters/drifters_io.F90 -shared/drifters/drifters_push.h -shared/drifters/drifters_set_field.h -shared/drifters/fms_switches.h -shared/drifters/quicksort.F90 -shared/exchange/stock_constants.F90 -shared/exchange/xgrid.F90 -shared/fms/fms.F90 -shared/fms/fms_io.F90 -shared/fms/read_data_2d.inc -shared/fms/read_data_3d.inc -shared/fms/read_data_4d.inc -shared/fms/write_data.inc -shared/mpp/mpp.F90 -shared/mpp/mpp_data.F90 -shared/mpp/mpp_domains.F90 -shared/mpp/mpp_io.F90 -shared/mpp/mpp_memutils.F90 -shared/mpp/mpp_parameter.F90 -shared/mpp/mpp_pset.F90 -shared/mpp/mpp_utilities.F90 -shared/mpp/nsclock.c -shared/mpp/threadloc.c -shared/mpp/include/mpp_chksum.h -shared/mpp/include/mpp_chksum_int.h -shared/mpp/include/mpp_chksum_scalar.h -shared/mpp/include/mpp_comm.inc -shared/mpp/include/mpp_comm_mpi.inc -shared/mpp/include/mpp_comm_nocomm.inc -shared/mpp/include/mpp_comm_sma.inc -shared/mpp/include/mpp_data_mpi.inc -shared/mpp/include/mpp_data_nocomm.inc -shared/mpp/include/mpp_data_sma.inc -shared/mpp/include/mpp_do_get_boundary.h -shared/mpp/include/mpp_do_global_field.h -shared/mpp/include/mpp_do_redistribute.h -shared/mpp/include/mpp_do_update.h -shared/mpp/include/mpp_do_updateV.h -shared/mpp/include/mpp_do_updateV_ad.h -shared/mpp/include/mpp_do_update_ad.h -shared/mpp/include/mpp_domains_comm.inc -shared/mpp/include/mpp_domains_define.inc -shared/mpp/include/mpp_domains_misc.inc -shared/mpp/include/mpp_domains_reduce.inc -shared/mpp/include/mpp_domains_util.inc -shared/mpp/include/mpp_error_a_a.h -shared/mpp/include/mpp_error_a_s.h -shared/mpp/include/mpp_error_s_a.h -shared/mpp/include/mpp_error_s_s.h -shared/mpp/include/mpp_get_boundary.h -shared/mpp/include/mpp_global_field.h -shared/mpp/include/mpp_global_reduce.h -shared/mpp/include/mpp_global_sum.h -shared/mpp/include/mpp_global_sum_ad.h -shared/mpp/include/mpp_global_sum_tl.h -shared/mpp/include/mpp_io_connect.inc -shared/mpp/include/mpp_io_misc.inc -shared/mpp/include/mpp_io_read.inc -shared/mpp/include/mpp_io_util.inc -shared/mpp/include/mpp_io_write.inc -shared/mpp/include/mpp_read_2Ddecomp.h -shared/mpp/include/mpp_reduce_mpi.h -shared/mpp/include/mpp_reduce_nocomm.h -shared/mpp/include/mpp_reduce_sma.h -shared/mpp/include/mpp_sum.inc -shared/mpp/include/mpp_sum_mpi.h -shared/mpp/include/mpp_sum_nocomm.h -shared/mpp/include/mpp_sum_sma.h -shared/mpp/include/mpp_transmit.inc -shared/mpp/include/mpp_transmit_mpi.h -shared/mpp/include/mpp_transmit_nocomm.h -shared/mpp/include/mpp_transmit_sma.h -shared/mpp/include/mpp_update_domains2D.h -shared/mpp/include/mpp_update_domains2D_ad.h -shared/mpp/include/mpp_util.inc -shared/mpp/include/mpp_util_mpi.inc -shared/mpp/include/mpp_util_nocomm.inc -shared/mpp/include/mpp_util_sma.inc -shared/mpp/include/mpp_write.h -shared/mpp/include/mpp_write_2Ddecomp.h -shared/mpp/include/system_clock.h -