Changeset 9596 for NEMO/trunk/src/NST

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:

• . (copied) (copied from NEMO/trunk/NEMOGCM/NEMO)
• NST (copied) (copied from NEMO/trunk/NEMOGCM/NEMO/NST_SRC)
• NST/agrif_ice_interp.F90 (copied) (copied from NEMO/trunk/NEMOGCM/NEMO/NST_SRC/agrif_si3_interp.F90) (3 diffs)
• NST/agrif_ice_update.F90 (copied) (copied from NEMO/trunk/NEMOGCM/NEMO/NST_SRC/agrif_si3_update.F90) (3 diffs)
• NST/agrif_si3_interp.F90 (deleted)
• NST/agrif_si3_update.F90 (deleted)
• NST/agrif_user.F90 (modified) (2 diffs)

NEMO/trunk/src/NST/agrif_ice_interp.F90

@@ -1 @@
-MODULE agrif_si3_interp
+MODULE agrif_ice_interp
    !!=====================================================================================
-   !!                       ***  MODULE agrif_si3_interp ***
+   !!                       ***  MODULE agrif_ice_interp ***
    !! Nesting module :  interp surface ice boundary condition from a parent grid
    !! Sea-Ice model  :  LIM 3.6 Sea ice model time-stepping
@@ -33 +33 @@
    !!----------------------------------------------------------------------
    !! NEMO/NST 3.6 , NEMO Consortium (2016)
-   !! $Id: agrif_si3_interp.F90 6204 2016-01-04 13:47:06Z cetlod $
+   !! $Id: agrif_ice_interp.F90 6204 2016-01-04 13:47:06Z cetlod $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -371 +371 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE agrif_si3_interp_empty
-      WRITE(*,*)  'agrif_si3_interp : You should not have seen this print! error?'
-   END SUBROUTINE agrif_si3_interp_empty
+   SUBROUTINE agrif_ice_interp_empty
+      WRITE(*,*)  'agrif_ice_interp : You should not have seen this print! error?'
+   END SUBROUTINE agrif_ice_interp_empty
 #endif
 
    !!======================================================================
-END MODULE agrif_si3_interp
+END MODULE agrif_ice_interp

NEMO/trunk/src/NST/agrif_ice_update.F90

@@ -2 +2 @@
 !!#undef TWO_WAY
 
-MODULE agrif_si3_update
+MODULE agrif_ice_update
    !!=====================================================================================
-   !!                       ***  MODULE agrif_si3_update ***
+   !!                       ***  MODULE agrif_ice_update ***
    !! Nesting module :  update surface ocean boundary condition over ice from a child grid
    !! Sea-Ice model  :  LIM 3.6 Sea ice model time-stepping
@@ -37 +37 @@
    !!----------------------------------------------------------------------
    !! NEMO/NST 4.0 , LOCEAN-IPSL (2017)
-   !! $Id: agrif_si3_update.F90 6204 2016-01-04 13:47:06Z cetlod $
+   !! $Id: agrif_ice_update.F90 6204 2016-01-04 13:47:06Z cetlod $
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -210 +210 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE agrif_si3_update_empty
-      WRITE(*,*)  'agrif_si3_update : You should not have seen this print! error?'
-   END SUBROUTINE agrif_si3_update_empty
+   SUBROUTINE agrif_ice_update_empty
+      WRITE(*,*)  'agrif_ice_update : You should not have seen this print! error?'
+   END SUBROUTINE agrif_ice_update_empty
 #endif
 
    !!======================================================================
-END MODULE agrif_si3_update
+END MODULE agrif_ice_update

NEMO/trunk/src/NST/agrif_user.F90

@@ -308 +308 @@
 #endif
 #if defined key_si3
-   USE agrif_si3_update
+   USE agrif_ice_update
 #endif
    !
@@ -504 +504 @@
    USE agrif_ice
    USE in_out_manager
-   USE agrif_si3_interp
+   USE agrif_ice_interp
    USE lib_mpp
    !