New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5807 – NEMO

Changeset 5807


Ignore:
Timestamp:
2015-10-19T15:34:10+02:00 (9 years ago)
Author:
diovino
Message:
 
Location:
branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

    r5282 r5807  
    387387      !!---------------------------------------------------------------------- 
    388388 
    389 !#if  
    390 !#endif 
    391  
    392389      IF(lwp) WRITE(numout,*) '  ' 
    393390      IF(lwp) WRITE(numout,*) 'dia_wri_harm : Write harmonic analysis results' 
    394 !#if  
    395 !#endif 
    396391      IF(lwp) WRITE(numout,*) '  ' 
    397392 
    … …  
    399394      !///////////// 
    400395      ! 
    401 !#if  
    402 !#else 
    403396      DO jh = 1, nb_ana 
    404397      CALL iom_put( TRIM(tname(jh))//'x', out_eta(:,:,jh) ) 
    405398      CALL iom_put( TRIM(tname(jh))//'y', out_eta(:,:,nb_ana+jh) ) 
    406399      END DO 
    407 !#endif 
    408400 
    409401      ! B) ubar 
    410402      !///////// 
    411403      ! 
    412 !#if  
    413 !#else 
    414404      DO jh = 1, nb_ana 
    415405      CALL iom_put( TRIM(tname(jh))//'x_u', out_u(:,:,jh) ) 
    416406      CALL iom_put( TRIM(tname(jh))//'y_u', out_u(:,:,nb_ana+jh) ) 
    417407      END DO 
    418 !#endif 
    419408 
    420409      ! C) vbar 
    421410      !///////// 
    422411      ! 
    423 !#if  
    424 !#else 
    425412      DO jh = 1, nb_ana 
    426413         CALL iom_put( TRIM(tname(jh))//'x_v', out_v(:,:,jh       ) ) 
    427414         CALL iom_put( TRIM(tname(jh))//'y_v', out_v(:,:,jh+nb_ana) ) 
    428415      END DO 
    429 !#endif 
    430416      ! 
    431417   END SUBROUTINE dia_wri_harm 

  • branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r5282 r5807  
    297297 
    298298      IF( mynode == 0 ) THEN 
    299         CALL ctl_opn( kumond, 'output.namelist.dyn', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -2, 6, .TRUE. , 1 ) 
     299        CALL ctl_opn( kumond, 'output.namelist.dyn', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 ) 
    300300        WRITE(kumond, nammpp)       
    301301      ENDIF 
    … …  
    31983198      IF( PRESENT( localComm ) .OR. .NOT.PRESENT( localComm ) )   function_value = 0 
    31993199      IF( .FALSE. )   ldtxt(:) = 'never done' 
    3200       CALL ctl_opn( kumond, 'output.namelist.dyn', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, 6, .TRUE. , 1 ) 
     3200      CALL ctl_opn( kumond, 'output.namelist.dyn', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 ) 
    32013201   END FUNCTION mynode 
    32023202 

  • branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r5282 r5807  
    255255            CALL dom_vvl_interpol( fse3t_b(:,:,:), fse3u_b(:,:,:), 'U' ) 
    256256            CALL dom_vvl_interpol( fse3t_b(:,:,:), fse3v_b(:,:,:), 'V' ) 
    257             CALL dom_vvl_interpol( fse333333333333333333333333333333333t_n(:,:,:), fse3u_n(:,:,:), 'U' ) 
     257            CALL dom_vvl_interpol( fse3t_n(:,:,:), fse3u_n(:,:,:), 'U' ) 
    258258            CALL dom_vvl_interpol( fse3t_n(:,:,:), fse3v_n(:,:,:), 'V' ) 
    259259            CALL dom_vvl_interpol( fse3u_n(:,:,:), fse3f_n(:,:,:), 'F' ) 

  • branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90

    r5282 r5807  
    133133      IF( l_trdtrc ) THEN! trends 
    134134         DO jn = 1, jptra 
    135          zfact = 1.e0 / r2dtrc 
     135            zfact = 1.e0 / r2dtrc 
    136136            DO jk = 1, jpkm1 
    137137               ztrdt(:,:,jk,jn) = ( trb(:,:,jk,jn) - ztrdt(:,:,jk,jn) ) * zfact  

  • branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/TOP_SRC/TRP/trdmxl_trc.F90

    r5282 r5807  
    771771      ! ====================================================================== 
    772772 
    773 !# if 
    774 !# else 
    775        
    776773      ! IV.1 Code for IOIPSL/NetCDF output 
    777774      ! ---------------------------------- 
    … …  
    858855      icount = 1 
    859856 
    860 !# endif 
    861  
    862857      IF( MOD( itmod, nn_trd_trc ) == 0 ) THEN 
    863858         ! 
    … …  
    10441039      ! ====================================================================== 
    10451040 
    1046 !# if 
    1047 !# else 
    1048  
    10491041      ! IV.1 Code for IOIPSL/NetCDF output 
    10501042      ! ---------------------------------- 
    … …  
    10921084 
    10931085 
    1094 !# endif 
    10951086 
    10961087      IF( MOD( itmod, nn_trd_trc ) == 0 ) THEN 
    … …  
    12431234      ! ====================================================================== 
    12441235 
    1245 !#if  
    1246 !#else 
    12471236      ! clmxl = legend root for netCDF output 
    12481237      IF( nn_ctls_trc == 0 ) THEN                                   ! control surface = mixed-layer with density criterion 
    … …  
    13871376#endif 
    13881377 
    1389 !#endif 
    13901378   END SUBROUTINE trd_mxl_trc_init 
    13911379 

  • branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/SETTE/sette.sh

    r5282 r5807  
    8888# 
    8989# Compiler among those in NEMOGCM/ARCH 
    90 COMPILER=ifort_athena 
    91 export BATCH_COMMAND_PAR="bsub <" 
     90COMPILER=X64_ADA 
     91export BATCH_COMMAND_PAR="llsubmit" 
    9292export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
    9393export INTERACT_FLAG="no" 
    9494export MPIRUN_FLAG="yes" 
    95 export USING_XIOS="no" 
     95export USING_XIOS="yes" 
    9696# 
    9797export DEL_KEYS="key_iomput" 

  • branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/SETTE/sette_xios.sh

    r5282 r5807  
    8484# 
    8585# Compiler among those in NEMOGCM/ARCH 
    86 COMPILER=ifort_athena_xios 
    87 export BATCH_COMMAND_PAR="bsub <" 
     86COMPILER=X64_ADA 
     87export BATCH_COMMAND_PAR="llsubmit" 
    8888export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
    8989export INTERACT_FLAG="no" 
Note: See TracChangeset for help on using the changeset viewer.