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

Timestamp:

2011-02-22T18:14:26+01:00 (13 years ago)

Author:

trackstand2

Message:

Made module arrays allocatable and added calls to _alloc()s in nemo_alloc()

File:

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

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

@@ -572 +572 @@
      USE tranxt,       ONLY: tra_nxt_alloc
      USE trazdf,       ONLY: tra_zdf_alloc
+
+     ! TOP-related alloc routines...
 #if defined key_top
+     USE trcadv,       ONLY: trc_adv_alloc
      USE trc,          ONLY: trc_alloc
+     USE trcnxt,       ONLY: trc_nxt_alloc
+     USE trczdf,       ONLY: trc_zdf_alloc
+     USE trdmod_trc_oce,ONLY: trd_mod_trc_oce_alloc
 #endif
 #if defined key_top && ! defined key_iomput
      USE trcdia,       ONLY: trc_dia_alloc
 #endif
+#if  defined key_top && defined key_trcdmp 
+     USE trcdmp,       ONLY: trc_dmp_alloc
+#endif
 #if  defined key_top  &&  defined key_dtatrc
      USE trcdta,       ONLY: trc_dta_alloc
 #endif
+     ! ...end of TOP-related alloc routines
+
+     ! LOBSTER-related alloc routines...
+     USE sms_lobster,  ONLY: sms_lobster_alloc
+     ! ...end of LOBSTER-related alloc routines
+
      USE trc_oce,      ONLY: trc_oce_alloc
 #if   defined key_trdmld   ||   defined key_esopa
@@ -730 +745 @@
      ierr = ierr + tra_nxt_alloc()
      ierr = ierr + tra_zdf_alloc()
+
+     ! Start of TOP-related alloc routines...
 #if defined key_top
+     ierr = ierr + trc_adv_alloc()
      ierr = ierr + trc_alloc()
+     ierr = ierr + trc_nxt_alloc()
+     ierr = ierr + trc_zdf_alloc()
+     ierr = ierr + trd_mod_trc_oce_alloc()
 #endif
 #if defined key_top && ! defined key_iomput
      ierr = ierr + trc_dia_alloc()
 #endif
+#if  defined key_top && defined key_trcdmp 
+     ierr = ierr + trc_dmp_alloc()
+#endif
 #if  defined key_top  &&  defined key_dtatrc
      ierr = ierr + trc_dta_alloc()
 #endif
+     ! ...end of TOP-related alloc routines
+
+     ! Start of LOBSTER-related alloc routines
+     ierr = ierr + sms_lobster_alloc()
+     ! ...end of LOBSTER-related alloc routines
+
      ierr = ierr + trc_oce_alloc()
 #if   defined key_trdmld   ||   defined key_esopa