Changeset 3362

Timestamp:

2012-04-24T12:35:17+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3322_NOCS09_SAS: Restructure standalone code to reduce impact on SBC code.

Moral: never talk to Gurvan just as you are finishing a development branch.

Location:

branches/2012/dev_r3322_NOCS09_SAS/NEMOGCM

Files:

• CONFIG/ORCA2_SAS_LIM/EXP00/namelist (modified) (1 diff)
• NEMO/SAS_SRC/nemogcm.F90 (modified) (2 diffs)
• NEMO/SAS_SRC/sbcmod.F90 (deleted)
• NEMO/SAS_SRC/sbcsas.F90 (deleted)
• NEMO/SAS_SRC/sbcssm.F90 (added)
• NEMO/SAS_SRC/step.F90 (modified) (3 diffs)

branches/2012/dev_r3322_NOCS09_SAS/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist

@@ -152 +152 @@
 !              !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation !
 !              !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  !
-   sn_tem      = 'sas_grid_T' ,    120    , 'votemper' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
-   sn_sal      = 'sas_grid_T' ,    120    , 'vosaline' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
-   sn_uwd      = 'sas_grid_U' ,    120    , 'vozocrtx' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
-   sn_vwd      = 'sas_grid_V' ,    120    , 'vomecrty' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
-
+   sn_usp      = 'sas_grid_U' ,    120    , 'vozocrtx' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
+   sn_vsp      = 'sas_grid_V' ,    120    , 'vomecrty' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
+   sn_tem      = 'sas_grid_T' ,    120    , 'sosstsst' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
+   sn_sal      = 'sas_grid_T' ,    120    , 'sosaline' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
+   sn_ssh      = 'sas_grid_T' ,    120    , 'sossheig' ,  .true.    , .true. ,   'yearly'  , ''       , ''         
+
+   ln_3d_uv    = .true.    !  specify whether we are supplying a 3D u,v field
    cn_dir      = './'      !  root directory for the location of the bulk files are
 /

branches/2012/dev_r3322_NOCS09_SAS/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

@@ -53 +53 @@
    USE mod_ioclient
 #endif
-   USE sbcsas
+   USE sbcssm
 
    IMPLICIT NONE
@@ -256 +256 @@
                             CALL day_init   ! model calendar (using both namelist and restart infos)
 
-                            CALL sbc_sas_init   ! initialise standalone scheme
+                            CALL sbc_ssm_sas_init   ! initialise standalone scheme
                             CALL sbc_init   ! Forcings : surface module 
       

branches/2012/dev_r3322_NOCS09_SAS/NEMOGCM/NEMO/SAS_SRC/step.F90

@@ -6 +6 @@
    !!======================================================================
    !! History :  OPA  !  1991-03  (G. Madec)  Original code
-   !!             -   !  1991-11  (G. Madec)
-   !!             -   !  1992-06  (M. Imbard)  add a first output record
-   !!             -   !  1996-04  (G. Madec)  introduction of dynspg
-   !!             -   !  1996-04  (M.A. Foujols)  introduction of passive tracer
-   !!            8.0  !  1997-06  (G. Madec)  new architecture of call
-   !!            8.2  !  1997-06  (G. Madec, M. Imbard, G. Roullet)  free surface
-   !!             -   !  1999-02  (G. Madec, N. Grima)  hpg implicit
-   !!             -   !  2000-07  (J-M Molines, M. Imbard)  Open Bondary Conditions
-   !!   NEMO     1.0  !  2002-06  (G. Madec)  free form, suppress macro-tasking
-   !!             -   !  2004-08  (C. Talandier) New trends organization
-   !!             -   !  2005-01  (C. Ethe) Add the KPP closure scheme
-   !!             -   !  2005-11  (G. Madec)  Reorganisation of tra and dyn calls
-   !!             -   !  2006-01  (L. Debreu, C. Mazauric)  Agrif implementation
-   !!             -   !  2006-07  (S. Masson)  restart using iom
-   !!            3.2  !  2009-02  (G. Madec, R. Benshila)  reintroduicing z*-coordinate
-   !!             -   !  2009-06  (S. Masson, G. Madec)  TKE restart compatible with key_cpl
-   !!            3.3  !  2010-05  (K. Mogensen, A. Weaver, M. Martin, D. Lea) Assimilation interface
-   !!             -   !  2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase + merge TRC-TRA
-   !!            3.4  !  2011-04  (G. Madec, C. Ethe) Merge of dtatem and dtasal
-   !!            3.5  !  2012-03  (S. Alderson)
+   !!             .   !    .                                                     
+   !!             .   !    .                                                     
+   !!   NEMO     3.5  !  2012-03  (S. Alderson)
    !!----------------------------------------------------------------------
 
@@ -89 +72 @@
 # endif   
 #endif   
-                             indic = 0                    ! reset to no error condition
       IF( kstp /= nit000 )   CALL day( kstp )             ! Calendar (day was already called at nit000 in day_init)
                              CALL iom_setkt( kstp )       ! say to iom that we are at time step kstp
@@ -97 +79 @@
                              CALL dia_wri( kstp )         ! ocean model: outputs
 
-                             indic = 0
+                             indic = 0                    ! although indic is not changed in stp_ctl
+                                                          ! need to keep the same interface 
                              CALL stp_ctl( kstp, indic )
-      IF( indic < 0      )   THEN
-                             CALL ctl_stop( 'step: indic < 0' )
-                             CALL dia_wri_state( 'output.abort', kstp )
-      ENDIF
       !
       IF( nn_timing == 1 .AND.  kstp == nit000  )   CALL timing_reset