Changeset 6232


Ignore:
Timestamp:
2016-01-12T17:25:19+01:00 (5 years ago)
Author:
lovato
Message:

Fix for ticket #1645 (and update CMCC xios arch file)

Location:
branches/2015/nemo_v3_6_STABLE/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm

    r6204 r6232  
    3434 
    3535# required modules 
    36 # module load  INTEL/intel_xe_2013 NETCDF/netcdf-4.3_parallel NETCDF/parallel-netcdf-1.3.1 HDF5/hdf5-1.8.11_parallel 
     36# module load  INTEL/intel_xe_2013 NETCDF/netcdf-4.3_parallel_shared NETCDF/parallel-netcdf-1.3.1 HDF5/hdf5-1.8.11_parallel_shared 
    3737 
    3838# Environment variables set by user. Others should automatically define when loading modules. 
    39 # export XIOS=/users/home/models/nemo/xios 
     39#export XIOS=/users/home/models/nemo/xios 
     40#export HDF5=/users/home/opt/hdf5/hdf5-1.8.11_parallel_shared 
     41#export NETCDF=/users/home/opt/netcdf/netcdf-4.3_parallel_shared 
    4042 
    41 %NCDF_INC            -I$NETCDF/include -I$PNETCDF/include 
    42 %NCDF_LIB            -L$NETCDF/lib -lnetcdff -lnetcdf -L$PNETCDF/lib -lpnetcdf 
    43 %HDF5_INC            -I$PHDF5/include 
    44 %HDF5_LIB            -L$PHDF5/lib -lhdf5_hl -lhdf5 
    45 %XIOS_INC            -I$XIOS/inc 
    46 %XIOS_LIB            -L$XIOS/lib -lxios 
     43%NCDF_INC            -I${NETCDF}/include  
     44%NCDF_LIB            -L${NETCDF}/lib -lnetcdff -lnetcdf 
     45%HDF5_INC            -I${HDF5}/include 
     46%HDF5_LIB            -L${HDF5}/lib -lhdf5_hl -lhdf5 
     47%XIOS_INC            -I${XIOS}/inc 
     48%XIOS_LIB            -L${XIOS}/lib -lxios 
    4749%CPP                 cpp 
    4850%FC                  mpiifort 
    49 %FCFLAGS             -r8 -O3 -xHost -fp-model source -traceback 
     51%FCFLAGS             -r8 -O3 -xHost -fp-model source -traceback ${CFLAGS}  
    5052%FFLAGS              %FCFLAGS 
    5153%LD                  mpiifort 
    5254%FPPFLAGS            -P -C -traditional 
    53 %LDFLAGS             -lstdc++ -lz -lgpfs -lcurl 
     55%LDFLAGS             -lstdc++ -lz -lgpfs -lcurl  ${LDFLAGS} 
    5456%AR                  ar  
    5557%ARFLAGS             -r 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

    r6204 r6232  
    5252   REAL(wp)                   ::   rn_hrnf         !: runoffs, depth over which enhanced vertical mixing is used 
    5353   REAL(wp)          , PUBLIC ::   rn_avt_rnf      !: runoffs, value of the additional vertical mixing coef. [m2/s] 
    54    REAL(wp)                  ::   rn_rfact        !: multiplicative factor for runoff 
     54   REAL(wp)          , PUBLIC ::   rn_rfact        !: multiplicative factor for runoff 
    5555 
    5656   LOGICAL           , PUBLIC ::   l_rnfcpl = .false.       ! runoffs recieved from oasis 
Note: See TracChangeset for help on using the changeset viewer.