Changeset 3305 for trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars

Timestamp:

Apr 18, 2024, 11:38:40 AM (8 months ago)

Author:

jbclement

Message:

Mars PCM:

• Addition of the "startfi" file name as an argument for "phys_state_var_init_mod.F90"/"iniphysiq_mod.F90" to be able to initialize correctly the 3D PEM with its dedicated "startfi" file name.
• Small update of xml files for XIOS in the deftank, mainly to make the 3D PEM run with slopes.
• Few cleanings in "phyetat0_mod.F90".

JBC

Location:

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars

Files:

• iniphysiq_mod.F90 (modified) (5 diffs)
• newstart.F (modified) (1 diff)
• nogcm.F90 (modified) (1 diff)
• start2archive.F (modified) (1 diff)
• start2archive_SSO.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/iniphysiq_mod.F90

@@ -3 +3 @@
 CONTAINS
 
-subroutine iniphysiq(ii,jj,nlayer, &
-                     nbp, communicator, &
-                     punjours, pdayref,ptimestep, &
+subroutine iniphysiq(filename,ii,jj,nlayer,               &
+                     nbp, communicator,                   &
+                     punjours, pdayref,ptimestep,         &
                      rlatudyn,rlatvdyn,rlonudyn,rlonvdyn, &
-                     airedyn,cudyn,cvdyn, &
+                     airedyn,cudyn,cvdyn,                 &
                      prad,pg,pr,pcpp,iflag_phys)
 
 ! Modules from the dynamics:
-use infotrac, only : nqtot, & ! number of advected tracers
-                     tname, & ! tracer names
-                     nqperes,nqfils! MVals: variables isotopes
+use infotrac, only : nqtot, &        ! number of advected tracers
+                     tname, &        ! tracer names
+                     nqperes, nqfils ! MVals: variables isotopes
 use temps_mod, only: day_ini, day_end, hour_ini
 
@@ -23 +23 @@
 use geometry_mod, only: cell_area, & ! physics grid area (m2)
                         longitude, & ! longitudes (rad)
-                        latitude ! latitudes (rad)
+                        latitude     ! latitudes (rad)
 use phys_state_var_init_mod, only: phys_state_var_init
 use mod_phys_lmdz_para, only: klon_omp ! number of columns (on local omp grid)
@@ -32 +32 @@
 include "iniprint.h"
 
+character(*), intent(in) :: filename ! Name of the "startfi.nc" file
 real,intent(in) :: prad ! radius of the planet (m)
 real,intent(in) :: pg ! gravitational acceleration (m/s2)
@@ -57 +58 @@
   ! --> initialize physics distribution, global fields and geometry
   ! (i.e. things in phy_common or dynphy_lonlat)
-  CALL inigeomphy(ii,jj,nlayer, &
-               nbp, communicator, &
-               rlatudyn,rlatvdyn, &
-               rlonudyn,rlonvdyn, &
-               airedyn,cudyn,cvdyn)
+  CALL inigeomphy(ii,jj,nlayer,      &
+                  nbp, communicator, &
+                  rlatudyn,rlatvdyn, &
+                  rlonudyn,rlonvdyn, &
+                  airedyn,cudyn,cvdyn)
 
   ! the distinct part for all planetary physics (ie. things in phymars)
@@ -71 +72 @@
 !$OMP PARALLEL COPYIN(day_ini,day_end,hour_ini)
 
-call phys_state_var_init(klon_omp,nlayer,nqtot,tname, &
-                         day_ini,day_end,hour_ini,&
-                         punjours,ptimestep, &
-                         prad,pg,pr,pcpp, &
+call phys_state_var_init(filename,klon_omp,nlayer,nqtot,tname, &
+                         day_ini,day_end,hour_ini,             &
+                         punjours,ptimestep,                   &
+                         prad,pg,pr,pcpp,                      &
                          nqperes,nqfils) ! MVals: variables isotopes
 call ini_fillgeom(klon_omp,latitude,longitude,cell_area)

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/newstart.F

@@ -391 +391 @@
 
 ! Initialize the physics
-         CALL iniphysiq(iim,jjm,llm,
+         CALL iniphysiq('startfi.nc',iim,jjm,llm,
      &                  (jjm-1)*iim+2,comm_lmdz,
      &                  daysec,day_ini,dtphys,
      &                  rlatu,rlatv,rlonu,rlonv,
-     &                  aire,cu,cv,rad,g,r,cpp,
-     &                  1)
+     &                  aire,cu,cv,rad,g,r,cpp,1)
 
 c=======================================================================

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/nogcm.F90

@@ -458 +458 @@
      ! Physics:
 #ifdef CPP_PHYS
-     CALL iniphysiq(iim,jjm,llm, &
-          (jjm-1)*iim+2,comm_lmdz, &
-          daysec,day_ini,dtphys/nsplit_phys, &
+     CALL iniphysiq('startfi.nc',iim,jjm,llm,             &
+          (jjm-1)*iim+2,comm_lmdz,                        &
+          daysec,day_ini,dtphys/nsplit_phys,              &
           rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
           iflag_phys)

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive.F

@@ -160 +160 @@
 
 ! Initialize the physics
-         CALL iniphysiq(iim,jjm,llm,
+      fichnom = 'startfi.nc'
+
+         CALL iniphysiq(fichnom,iim,jjm,llm,
      &                  (jjm-1)*iim+2,comm_lmdz,
      &                  daysec,day_ini,dtphys,
      &                  rlatu,rlatv,rlonu,rlonv,
-     &                  aire,cu,cv,rad,g,r,cpp,
-     &                  1)
-
-      fichnom = 'startfi.nc'
+     &                  aire,cu,cv,rad,g,r,cpp,1)
+
       Lmodif=0
 

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive_SSO.F

@@ -173 +173 @@
 
 ! Initialize the physics
-         CALL iniphysiq(iim,jjm,llm,
+      fichnom = 'startfi.nc'
+
+         CALL iniphysiq(fichnom,iim,jjm,llm,
      &                  (jjm-1)*iim+2,comm_lmdz,
      &                  daysec,day_ini,dtphys,
      &                  rlatu,rlatv,rlonu,rlonv,
-     &                  aire,cu,cv,rad,g,r,cpp,
-     &                  1)
-
-      fichnom = 'startfi.nc'
+     &                  aire,cu,cv,rad,g,r,cpp,1)
+
       Lmodif=0