using updated forcing and init data in builtin configs

CMakeLists.txt

@@ -143,3 +143,15 @@ add_custom_command(
         COMMAND ${CMAKE_COMMAND} -E copy_directory
         ${CMAKE_SOURCE_DIR}/PAPA_06_2017/
         ${CMAKE_CURRENT_BINARY_DIR}/PAPA_06_2017/)
+
+add_custom_command(
+        TARGET obl POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_SOURCE_DIR}/meteo-init/
+        ${CMAKE_CURRENT_BINARY_DIR}/meteo-init/)
+
+add_custom_command(
+        TARGET obl POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_SOURCE_DIR}/meteo-forcing/
+        ${CMAKE_CURRENT_BINARY_DIR}/meteo-forcing/)

obl_run_papa_fluxes.f90

@@ -23,7 +23,7 @@ module obl_run_papa_fluxes
     ! --------------------------------------------------------------------------------
 
     ! --------------------------------------------------------------------------------
-    character(len = 256), parameter :: path = 'PAPA_06_2017/'
+    character(len = 256), parameter :: path = 'papa-2017-june/'
     ! --------------------------------------------------------------------------------
     
 
@@ -88,17 +88,17 @@ module obl_run_papa_fluxes
         !< using 'flux' mode
         is_meteo_setup = 0
 
-        call set_external_tforcing(sensible_hflux_surf, trim(path)//'sensible_hflux.dat')
-        call set_external_tforcing(latent_hflux_surf, trim(path)//'latent_hflux.dat')
+        call set_external_tforcing(sensible_hflux_surf, 'meteo-forcing/'//trim(path)//'sensible_hflux.dat')
+        call set_external_tforcing(latent_hflux_surf, 'meteo-forcing/'//trim(path)//'latent_hflux.dat')
 
         call set_const_tforcing(salin_flux_surf, 0.0)
 
-        call set_external_tforcing(tau_x_surf, trim(path)//'tau-x.dat')
-        call set_external_tforcing(tau_y_surf, trim(path)//'tau-y.dat')
+        call set_external_tforcing(tau_x_surf, 'meteo-forcing/'//trim(path)//'tau-x.dat')
+        call set_external_tforcing(tau_y_surf, 'meteo-forcing/'//trim(path)//'tau-y.dat')
 
-        call set_external_tforcing(sw_flux_surf, trim(path)//'SW-down.dat')
+        call set_external_tforcing(sw_flux_surf, 'meteo-forcing/'//trim(path)//'SW-down.dat')
 
-        call set_external_tforcing(lw_in_surf, trim(path)//'LW-down.dat')
+        call set_external_tforcing(lw_in_surf, 'meteo-forcing/'//trim(path)//'LW-down.dat')
 
         !< normalize time in external forcing: hrs -> sec
         call normalize_time_tforcing(sensible_hflux_surf, 3600.0)
@@ -135,8 +135,8 @@ module obl_run_papa_fluxes
         type (gridDataType), intent(in) :: grid
         ! ----------------------------------------------------------------------------
 
-        call set_external_profile(Theta, trim(path)//'Theta.dat', grid)
-        call set_external_profile(Salin, trim(path)//'Salin.dat', grid)
+        call set_external_profile(Theta, 'meteo-init/'//trim(path)//'Theta.dat', grid)
+        call set_external_profile(Salin, 'meteo-init/'//trim(path)//'Salin.dat', grid)
 
         call set_const_profile(U, 0.0, grid)
         call set_const_profile(V, 0.0, grid)

obl_run_papa_meteo.f90

@@ -23,7 +23,7 @@ module obl_run_papa_meteo
     ! --------------------------------------------------------------------------------
 
     ! --------------------------------------------------------------------------------
-    character(len = 256), parameter :: path = 'PAPA_06_2017/'
+    character(len = 256), parameter :: path = 'papa-2017-june/'
     ! --------------------------------------------------------------------------------
 
     
@@ -88,18 +88,18 @@ module obl_run_papa_meteo
         !< using 'meteo' mode
         is_meteo_setup = 1
 
-        call set_external_tforcing(Ua, trim(path)//'u-wind.dat')
-        call set_external_tforcing(Va, trim(path)//'v-wind.dat')
+        call set_external_tforcing(Ua, 'meteo-forcing/'//trim(path)//'u-wind.dat')
+        call set_external_tforcing(Va, 'meteo-forcing/'//trim(path)//'v-wind.dat')
 
         call set_const_tforcing(salin_flux_surf, 0.0)
 
-        call set_external_tforcing(Ta, trim(path)//'Tair.dat')
-        call set_external_tforcing(Pa, trim(path)//'Pair.dat')
-        call set_external_tforcing(RHa, trim(path)//'RHair.dat')
+        call set_external_tforcing(Ta, 'meteo-forcing/'//trim(path)//'Tair.dat')
+        call set_external_tforcing(Pa, 'meteo-forcing/'//trim(path)//'Pair.dat')
+        call set_external_tforcing(RHa, 'meteo-forcing/'//trim(path)//'RHair.dat')
 
-        call set_external_tforcing(sw_flux_surf, trim(path)//'SW-down.dat')
+        call set_external_tforcing(sw_flux_surf, 'meteo-forcing/'//trim(path)//'SW-down.dat')
 
-        call set_external_tforcing(lw_in_surf, trim(path)//'LW-down.dat')
+        call set_external_tforcing(lw_in_surf, 'meteo-forcing/'//trim(path)//'LW-down.dat')
 
         !< normalize time in external forcing: hrs -> sec
         call normalize_time_tforcing(Ua, 3600.0)
@@ -137,8 +137,8 @@ module obl_run_papa_meteo
         type (gridDataType), intent(in) :: grid
         ! ----------------------------------------------------------------------------
 
-        call set_external_profile(Theta, trim(path)//'Theta.dat', grid)
-        call set_external_profile(Salin, trim(path)//'Salin.dat', grid)
+        call set_external_profile(Theta, 'meteo-init/'//trim(path)//'Theta.dat', grid)
+        call set_external_profile(Salin, 'meteo-init/'//trim(path)//'Salin.dat', grid)
 
         call set_const_profile(U, 0.0, grid)
         call set_const_profile(V, 0.0, grid)