save all last changes that have been made, keep this opewn for a port…

…ential revert
FESOM · Sep 20, 2023 · 1d020e9 · 1d020e9
1 parent 968dec2
commit 1d020e9
Show file tree

Hide file tree

Showing 13 changed files with 1,461 additions and 89 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -145,9 +145,9 @@ if(${CMAKE_Fortran_COMPILER_ID} STREQUAL  Intel )
    else()
       target_compile_options(${PROJECT_NAME} PRIVATE -xHost)
    endif()
-#    target_compile_options(${PROJECT_NAME} PRIVATE -g -traceback ) #-check all,noarg_temp_created,bounds,uninit ) #-ftrapuv ) #-init=zero)
-#    target_compile_options(${PROJECT_NAME} PRIVATE -qopenmp -r8 -i4 -fp-model precise -no-prec-div -no-prec-sqrt -fimf-use-svml -xHost -ip -g -traceback -check all,noarg_temp_created,bounds,uninit ) #-ftrapuv ) #-init=zero)
-#    target_compile_options(${PROJECT_NAME} PRIVATE -r8 -i4 -fp-model precise -no-prec-div -no-prec-sqrt -fimf-use-svml -ip -g -traceback -check all,noarg_temp_created,bounds,uninit ) #-ftrapuv ) #-init=zero)
+   #target_compile_options(${PROJECT_NAME} PRIVATE -g -traceback ) #-check all,noarg_temp_created,bounds,uninit ) #-ftrapuv ) #-init=zero)
+   #target_compile_options(${PROJECT_NAME} PRIVATE -qopenmp -r8 -i4 -fp-model precise -no-prec-div -no-prec-sqrt -fimf-use-svml -xHost -ip -g -traceback -check all,noarg_temp_created,bounds,uninit ) #-ftrapuv ) #-init=zero)
+   #target_compile_options(${PROJECT_NAME} PRIVATE -r8 -i4 -fp-model precise -no-prec-div -no-prec-sqrt -fimf-use-svml -ip -g -traceback -check all,noarg_temp_created,bounds,uninit ) #-ftrapuv ) #-init=zero)
 
 elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL  GNU )
 #    target_compile_options(${PROJECT_NAME} PRIVATE -O3 -finit-local-zero  -finline-functions -fimplicit-none  -fdefault-real-8 -ffree-line-length-none)

diff --git a/src/MOD_MESH.F90 b/src/MOD_MESH.F90
@@ -99,9 +99,9 @@ MODULE MOD_MESH
 integer,       allocatable, dimension(:)    :: ind_south, ind_north    
 !#endif
 
-integer                                       :: nn_size
-integer, allocatable, dimension(:)            :: nn_num
-integer, allocatable, dimension(:,:)          :: nn_pos
+integer                                     :: nn_size
+integer, allocatable, dimension(:)          :: nn_num
+integer, allocatable, dimension(:,:)        :: nn_pos
 
 !_______________________________________________________________________________
 ! Arrays added for ALE implementation:
@@ -133,6 +133,11 @@ MODULE MOD_MESH
 real(kind=WP), allocatable,dimension(:)     :: zbar_n_srf
 real(kind=WP), allocatable,dimension(:)     :: zbar_e_srf
 
+!_______________________________________________________________________________
+real(kind=WP), allocatable,dimension(:,:)   :: hnode_fc, hnode_new_fc, helem_fc, zbar_3d_n_fc, Z_3d_n_fc
+real(kind=WP), allocatable,dimension(:)     :: bottom_elem_thickness_fc, bottom_node_thickness_fc
+real(kind=WP), allocatable,dimension(:)     :: zbar_n_bot_fc, zbar_e_bot_fc
+
 character(:), allocatable :: representative_checksum
 
 contains

diff --git a/src/associate_mesh_ass.h b/src/associate_mesh_ass.h
@@ -67,3 +67,13 @@ zbar_e_bot(1:myDim_elem2D+eDim_elem2D)                     => mesh%zbar_e_bot(:)
 zbar_n_srf(1:myDim_nod2D+eDim_nod2D)                       => mesh%zbar_n_srf(:)
 zbar_e_srf(1:myDim_elem2D+eDim_elem2D)                     => mesh%zbar_e_srf(:)
 
+
+hnode_fc(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D)            => mesh%hnode_fc(:,:)
+hnode_new_fc(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D)        => mesh%hnode_new_fc(:,:)
+zbar_3d_n_fc(1:mesh%nl, 1:myDim_nod2D+eDim_nod2D)          => mesh%zbar_3d_n_fc(:,:)
+Z_3d_n_fc(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D)           => mesh%Z_3d_n_fc(:,:)
+helem_fc(1:mesh%nl-1, 1:myDim_elem2D)                      => mesh%helem_fc(:,:)
+bottom_elem_thickness_fc(1:myDim_elem2D)                   => mesh%bottom_elem_thickness_fc(:)
+bottom_node_thickness_fc(1:myDim_nod2D+eDim_nod2D)         => mesh%bottom_node_thickness_fc(:)
+zbar_n_bot_fc(1:myDim_nod2D+eDim_nod2D)                    => mesh%zbar_n_bot_fc(:)
+zbar_e_bot_fc(1:myDim_elem2D+eDim_elem2D)                  => mesh%zbar_e_bot_fc(:)
diff --git a/src/associate_mesh_def.h b/src/associate_mesh_def.h
@@ -50,3 +50,14 @@ real(kind=WP), dimension(:)  , pointer :: zbar_n_bot
 real(kind=WP), dimension(:)  , pointer :: zbar_e_bot
 real(kind=WP), dimension(:)  , pointer :: zbar_n_srf
 real(kind=WP), dimension(:)  , pointer :: zbar_e_srf
+
+
+real(kind=WP), dimension(:,:), pointer :: hnode_fc
+real(kind=WP), dimension(:,:), pointer :: hnode_new_fc
+real(kind=WP), dimension(:,:), pointer :: zbar_3d_n_fc
+real(kind=WP), dimension(:,:), pointer :: Z_3d_n_fc
+real(kind=WP), dimension(:,:), pointer :: helem_fc
+real(kind=WP), dimension(:)  , pointer :: bottom_elem_thickness_fc
+real(kind=WP), dimension(:)  , pointer :: bottom_node_thickness_fc
+real(kind=WP), dimension(:)  , pointer :: zbar_n_bot_fc
+real(kind=WP), dimension(:)  , pointer :: zbar_e_bot_fc
diff --git a/src/oce_adv_tra_hor.F90 b/src/oce_adv_tra_hor.F90
@@ -680,14 +680,14 @@ subroutine adv_tra_hor_mfct(vel, ttf, partit, mesh, num_ord, flux, edge_up_dn_gr
 
            !___________________________________________________________________
            ! use downwind triangle to interpolate Tracer to edge center with 
-           ! fancy scheme --> Linear upwind reconstruction
+           ! fancy scheme --> Linear downwind reconstruction
            ! T_n+0.5 = T_n+1 - 1/2*deltax*GRADIENT
            ! --> GRADIENT = 2/3 GRAD_edgecenter + 1/3 GRAD_downwindtri
            ! T_n+0.5 = T_n+1 - 2/6*(T_n+1-T_n) + 1/6*gradT_down
            ! --> edge_up_dn_grad ... contains already elemental tracer gradient 
            !     of up and dn wind triangle
            ! --> Tmean2 ... edge center interpolated Tracer using tracer
-           !     gradient info from upwind triangle
+           !     gradient info from downwind triangle
            Tmean2=ttf(nz, enodes(2))- &
                   (2.0_WP*(ttf(nz, enodes(2))-ttf(nz,enodes(1)))+ &
                   edge_dxdy(1,edge)*a*edge_up_dn_grad(2,nz,edge)+ &
@@ -699,7 +699,7 @@ subroutine adv_tra_hor_mfct(vel, ttf, partit, mesh, num_ord, flux, edge_up_dn_gr
             ! --> GRADIENT = 2/3 GRAD_edgecenter + 1/3 GRAD_downwindtri
             ! T_n+0.5 = T_n + 2/6*(T_n+1-T_n) + 1/6*gradT_down
             ! --> Tmean1 ... edge center interpolated Tracer using tracer
-            !     gradient info from downwind triangle
+            !     gradient info from upwind triangle
             Tmean1=ttf(nz, enodes(1))+ &
                    (2.0_WP*(ttf(nz, enodes(2))-ttf(nz,enodes(1)))+ &
                    edge_dxdy(1,edge)*a*edge_up_dn_grad(1,nz,edge)+ &