Changeset 796


Ignore:
Timestamp:
01/10/19 17:35:05 (5 years ago)
Author:
jisesh
Message:

unstructured : reconstruction of velocity components (bugged)

Location:
codes/icosagcm/devel/src
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90

    r792 r796  
    1010#include "unstructured.h90" 
    1111 
    12 #define INDICES1 ij,l,iq,iedge,edge,ivertex,vertex,ij_left,ij_right 
    13 #define INDICES2 ij_up,ij_down,itrisk,edge_trisk,kup,kdown 
    14 #define EDGES edge1,edge2,edge3,edge4,edge5,edge6 
    15 #define VERTICES vertex1,vertex2,vertex3,vertex4,vertex5,vertex6 
    16 #define SIGNS sign1,sign2,sign3,sign4,sign5,sign6 
    17 #define EDGE_ENDS ij_up1,ij_up2,ij_up3,ij_up4,ij_up5,ij_up6,ij_down1,ij_down2,ij_down3,ij_down4,ij_down5,ij_down6 
    18 #define LENGTHS le_de1,le_de2,le_de3,le_de4,le_de5,le_de6 
    19 #define DECLARE_INDICES INTEGER INDICES1,INDICES2 
    20 #define DECLARE_EDGES NUM SIGNS,LENGTHS ; INTEGER EDGES, EDGE_ENDS 
    21 #define DECLARE_VERTICES INTEGER VERTICES 
    2212#define PHI_BOT(ij) Phi_bot 
    23  
    24 #define HASNAN(field) (ANY(.NOT.ABS(field)<1e20)) 
    25  
    26 #define START_TRACE(id,nprimal,ndual,nedge) CALL enter_trace(id, 8*llm*((nprimal)*primal_num+(ndual)*dual_num+(nedge)*edge_num) ) 
    27 #define STOP_TRACE CALL exit_trace() 
    2813 
    2914!----------------------------- Non-Hydrostatic ----------------------------- 

  • codes/icosagcm/devel/src/unstructured/data_unstructured.F90

    r784 r796  
    3939  NUM1(max_nb_stage), BIND(C)              :: tauj       ! diagonal of fast Butcher tableau 
    4040  NUM2(max_nb_stage,max_nb_stage), BIND(C) :: cslj, cflj ! slow and fast modified Butcher tableaus 
    41   NUM1(:), ALLOCATABLE            :: le_de, fv, Av, Ai 
    42   NUM2(:,:), ALLOCATABLE          :: Riv2, wee, ap,bp, mass_bl, mass_dak, mass_dbk 
     41  NUM1(:), ALLOCATABLE            :: le, le_de, fv, Av, Ai 
     42  NUM2(:,:), ALLOCATABLE          :: centroid, xyz_v, Riv2, wee, ap,bp, mass_bl, mass_dak, mass_dbk 
    4343 
    4444  INTEGER(C_INT), BIND(C) :: comm_icosa, dynamico_mpi_rank=0 

  • codes/icosagcm/devel/src/unstructured/unstructured.h90

    r744 r796  
    3030#define BINDC_(thename) BIND(C, name=#thename) 
    3131#define BINDC(thename) BINDC_(dynamico_ ## thename) 
     32 
     33#define INDICES1 ij,l,iq,iedge,edge,ivertex,vertex,ij_left,ij_right 
     34#define INDICES2 ij_up,ij_down,itrisk,edge_trisk,kup,kdown 
     35#define EDGES edge1,edge2,edge3,edge4,edge5,edge6 
     36#define VERTICES vertex1,vertex2,vertex3,vertex4,vertex5,vertex6 
     37#define SIGNS sign1,sign2,sign3,sign4,sign5,sign6 
     38#define EDGE_ENDS ij_up1,ij_up2,ij_up3,ij_up4,ij_up5,ij_up6,ij_down1,ij_down2,ij_down3,ij_down4,ij_down5,ij_down6 
     39#define LENGTHS le_de1,le_de2,le_de3,le_de4,le_de5,le_de6 
     40#define DECLARE_INDICES INTEGER INDICES1,INDICES2 
     41#define DECLARE_EDGES NUM SIGNS,LENGTHS ; INTEGER EDGES, EDGE_ENDS 
     42#define DECLARE_VERTICES INTEGER VERTICES 
     43 
     44#define START_TRACE(id,nprimal,ndual,nedge) CALL enter_trace(id, 8*llm*((nprimal)*primal_num+(ndual)*dual_num+(nedge)*edge_num) ) 
     45#define STOP_TRACE CALL exit_trace() 
     46 
Note: See TracChangeset for help on using the changeset viewer.