Changeset 9596 for NEMO/trunk/src


Ignore:
Timestamp:
2018-05-15T17:51:07+02:00 (3 years ago)
Author:
nicolasmartin
Message:

Reorganisation plan for NEMO repository: preliminary implementation of the new trunk structure (ref #2015)

  • Deletion of useless 1st level, add new explicit names for folders
  • Extract dev tools (SETTE and Trusting) to /utils/CI
  • Extract figures folder from documentation to /utils/figures
  • Extrac TEST_CASES to /utils/test_cases
  • Move ./TOOLS/COMPILE to ./mk
  • Add few wiki files at the root: README, INSTALL and LICENSE with full text of CeCILL v2.0
  • Style: uppercase for wiki files, lowercase for folder names

Additionally, inclusion of routines renaming in NST: agrif_si3 → agrif_ice

Location:
NEMO/trunk/src
Files:
9 deleted
5 edited
10 copied

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/icedyn_rhg_evp.F90

    r9570 r9596  
    2828   USE bdyice  
    2929#if defined key_agrif 
    30    USE agrif_si3_interp 
     30   USE agrif_ice_interp 
    3131#endif 
    3232   ! 
  • NEMO/trunk/src/ICE/icestp.F90

    r9570 r9596  
    5050# if defined key_agrif 
    5151   USE agrif_ice 
    52    USE agrif_si3_interp 
     52   USE agrif_ice_interp 
    5353# endif 
    5454   ! 
     
    176176         ! 
    177177!! clem: one should switch the calculation of the fluxes onto the parent grid but the following calls do not work 
    178 !!       moreover it should only be called at the update frequency (as in agrif_si3_update.F90) 
     178!!       moreover it should only be called at the update frequency (as in agrif_ice_update.F90) 
    179179!# if defined key_agrif 
    180180!         IF( .NOT. Agrif_Root() )     CALL Agrif_ChildGrid_To_ParentGrid() 
  • NEMO/trunk/src/NST/agrif_ice_interp.F90

    r9594 r9596  
    1 MODULE agrif_si3_interp 
     1MODULE agrif_ice_interp 
    22   !!===================================================================================== 
    3    !!                       ***  MODULE agrif_si3_interp *** 
     3   !!                       ***  MODULE agrif_ice_interp *** 
    44   !! Nesting module :  interp surface ice boundary condition from a parent grid 
    55   !! Sea-Ice model  :  LIM 3.6 Sea ice model time-stepping 
     
    3333   !!---------------------------------------------------------------------- 
    3434   !! NEMO/NST 3.6 , NEMO Consortium (2016) 
    35    !! $Id: agrif_si3_interp.F90 6204 2016-01-04 13:47:06Z cetlod $ 
     35   !! $Id: agrif_ice_interp.F90 6204 2016-01-04 13:47:06Z cetlod $ 
    3636   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    3737   !!---------------------------------------------------------------------- 
     
    371371   !!---------------------------------------------------------------------- 
    372372CONTAINS 
    373    SUBROUTINE agrif_si3_interp_empty 
    374       WRITE(*,*)  'agrif_si3_interp : You should not have seen this print! error?' 
    375    END SUBROUTINE agrif_si3_interp_empty 
     373   SUBROUTINE agrif_ice_interp_empty 
     374      WRITE(*,*)  'agrif_ice_interp : You should not have seen this print! error?' 
     375   END SUBROUTINE agrif_ice_interp_empty 
    376376#endif 
    377377 
    378378   !!====================================================================== 
    379 END MODULE agrif_si3_interp 
     379END MODULE agrif_ice_interp 
  • NEMO/trunk/src/NST/agrif_ice_update.F90

    r9594 r9596  
    22!!#undef TWO_WAY 
    33 
    4 MODULE agrif_si3_update 
     4MODULE agrif_ice_update 
    55   !!===================================================================================== 
    6    !!                       ***  MODULE agrif_si3_update *** 
     6   !!                       ***  MODULE agrif_ice_update *** 
    77   !! Nesting module :  update surface ocean boundary condition over ice from a child grid 
    88   !! Sea-Ice model  :  LIM 3.6 Sea ice model time-stepping 
     
    3737   !!---------------------------------------------------------------------- 
    3838   !! NEMO/NST 4.0 , LOCEAN-IPSL (2017) 
    39    !! $Id: agrif_si3_update.F90 6204 2016-01-04 13:47:06Z cetlod $ 
     39   !! $Id: agrif_ice_update.F90 6204 2016-01-04 13:47:06Z cetlod $ 
    4040   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4141   !!---------------------------------------------------------------------- 
     
    210210   !!---------------------------------------------------------------------- 
    211211CONTAINS 
    212    SUBROUTINE agrif_si3_update_empty 
    213       WRITE(*,*)  'agrif_si3_update : You should not have seen this print! error?' 
    214    END SUBROUTINE agrif_si3_update_empty 
     212   SUBROUTINE agrif_ice_update_empty 
     213      WRITE(*,*)  'agrif_ice_update : You should not have seen this print! error?' 
     214   END SUBROUTINE agrif_ice_update_empty 
    215215#endif 
    216216 
    217217   !!====================================================================== 
    218 END MODULE agrif_si3_update 
     218END MODULE agrif_ice_update 
  • NEMO/trunk/src/NST/agrif_user.F90

    r9570 r9596  
    308308#endif 
    309309#if defined key_si3 
    310    USE agrif_si3_update 
     310   USE agrif_ice_update 
    311311#endif 
    312312   ! 
     
    504504   USE agrif_ice 
    505505   USE in_out_manager 
    506    USE agrif_si3_interp 
     506   USE agrif_ice_interp 
    507507   USE lib_mpp 
    508508   ! 
  • NEMO/trunk/src/OCE/step_oce.F90

    r9570 r9596  
    106106   USE agrif_oce_update ! Update (2-way nesting) 
    107107#if defined key_si3 
    108    USE agrif_si3_update 
     108   USE agrif_ice_update 
    109109#endif 
    110110#if defined key_top 
  • NEMO/trunk/src/SAS/step.F90

    r9570 r9596  
    3939   USE agrif_oce, ONLY: lk_agrif_debug 
    4040#if defined key_si3 
    41    USE agrif_si3_update 
     41   USE agrif_ice_update 
    4242#endif 
    4343#endif 
Note: See TracChangeset for help on using the changeset viewer.