Changeset 2614 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2011-02-25T17:33:25+01:00 (13 years ago)

Author:

trackstand2

Message:

Changes in TOP/CFC for dynamic memory

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -560 +560 @@
       USE trdmld_trc,   ONLY: trd_mld_trc_alloc
 #endif
+#if defined key_cfc
+     USE trcsms_cfc,   ONLY: trc_sms_cfc_alloc
+#endif
       ! ...end of TOP-related alloc routines
 
       ! LOBSTER-related alloc routines...
+#if defined key_lobster
       USE sms_lobster,  ONLY: sms_lobster_alloc
+#endif
       ! ...end of LOBSTER-related alloc routines
 
@@ -625 +630 @@
 #if defined key_ldfslp   ||   defined key_esopa
       ierr = ierr + dyn_ldf_bilapg_alloc()
-#endif
-#if defined key_dtasal   ||   defined key_esopa
-      ierr = ierr + dta_sal_alloc()
 #endif
 #if defined key_dtatem   ||   defined key_esopa
@@ -707 +709 @@
       ierr = ierr + trd_mld_trc_alloc()
 #endif
+#if defined key_cfc
+     ierr = ierr + trc_sms_cfc_alloc()
+#endif
       ! ...end of TOP-related alloc routines
 
       ! Start of LOBSTER-related alloc routines
+#if defined key_lobster
       ierr = ierr + sms_lobster_alloc()
+#endif
       ! ...end of LOBSTER-related alloc routines