Changeset 1130 for trunk/LMDZ.MARS/libf/dyn3d/dynetat0.F

Timestamp:

Dec 20, 2013, 4:04:56 PM (11 years ago)

Author:

emillour

Message:

Mars GCM:
Series of changes to enable running in parallel (using LMDZ.COMMON dynamics);
Current LMDZ.MARS can still notheless be compiled and run in serial mode
"as previously".
Summary of main changes:

• Main programs (newstart, start2archive, xvik) that used to be in dyn3d have been moved to phymars.
• dyn3d/control.h is now module control_mod.F90
• rearanged input/outputs routines everywhere to handle serial/MPI cases. physdem.F => phyredem.F90 , phyetat0.F => phyetat0.F90 ; all read/write routines for startfi files are gathered in module iostart.F90
• added parallelism related routines init_phys_lmdz.F90, comgeomphy.F90, dimphy.F90, iniphysiq.F90, mod_grid_phy_lmdz.F90, mod_phys_lmdz_mpi_data.F90, mod_phys_lmdz_mpi_transfert.F90, mod_phys_lmdz_omp_data.F90, mod_phys_lmdz_omp_transfert.F90, mod_phys_lmdz_para.F90, mod_phys_lmdz_transfert_para.F90 in phymars and mod_const_mpi.F90 in dyn3d (for compliance with parallel case)
• created generic routines 'planetwide_maxval' and 'planetwide_minval', in module "planetwide_mod", that enable obtaining the min and max of a field over the whole planet.

EM

File:

• trunk/LMDZ.MARS/libf/dyn3d/dynetat0.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/dyn3d/dynetat0.F

@@ -3 +3 @@
       
       use netcdf
-      use infotrac, only: tnom
+      use infotrac, only: tname
+      use control_mod, only: timestart
       
       IMPLICIT NONE
@@ -39 +40 @@
 #include "logic.h"
 !#include "advtrac.h"
-#include "control.h"
+!#include "control.h"
 
 c   Arguments:
@@ -381 +382 @@
 !           WRITE(str3(2:3),'(i2.2)') iq
 !           ierr =  NF_INQ_VARID (nid, str3, nvarid)
-! NB: tracers are now read in using their name ('tnom' from infotrac)
-!           write(*,*) "  loading tracer:",trim(tnom(iq))
-           ierr=nf90_inq_varid(nid,tnom(iq),nvarid)
+! NB: tracers are now read in using their name ('tname' from infotrac)
+!           write(*,*) "  loading tracer:",trim(tname(iq))
+           ierr=nf90_inq_varid(nid,tname(iq),nvarid)
            IF (ierr .NE. nf90_noerr) THEN
 !              PRINT*, "dynetat0: Le champ <"//str3//"> est absent"
-              PRINT*, "dynetat0: Le champ <"//trim(tnom(iq))//
+              PRINT*, "dynetat0: Le champ <"//trim(tname(iq))//
      &                "> est absent"
               PRINT*, "          Il est donc initialise a zero"
@@ -396 +397 @@
              IF (ierr .NE. nf90_noerr) THEN
 !                 PRINT*, "dynetat0: Lecture echouee pour "//str3
-               PRINT*, "dynetat0: Lecture echouee pour "//trim(tnom(iq))
+               PRINT*,"dynetat0: Lecture echouee pour "//trim(tname(iq))
                CALL abort
              ENDIF