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

Timestamp:

Nov 24, 2023, 4:16:37 PM (13 months ago)

Author:

llange

Message:

Mars PCM
Bug fix in newstart, "perenial_co2ice" has been changed to "perennial_co2ice"
in -r3010 in the PCM without being changed in newstart. It is now corrected.
LL

Location:

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars

Files:

• newstart.F (modified) (11 diffs)
• start2archive.F (modified) (8 diffs)
• start2archive_SSO.F (modified) (7 diffs)

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

@@ -31 +31 @@
      &                     emis, hmons, summit, base, watercap,
      &               ini_surfdat_h_slope_var,end_surfdat_h_slope_var,
-     &               perenial_co2ice
+     &               perennial_co2ice
       use comsoil_h, only: inertiedat, inertiesoil,layer, mlayer,
      & nsoilmx,tsoil,ini_comsoil_h_slope_var, end_comsoil_h_slope_var,
@@ -198 +198 @@
       REAL,ALLOCATABLE :: qsurf_old_slope(:,:,:) ! tracer on surface (e.g. kg.m-2)
       REAL,ALLOCATABLE :: watercap_old_slope(:,:) ! Surface water ice (kg.m-2)
-      REAL,ALLOCATABLE :: perenial_co2_old_slope(:,:) ! Surface water ice (kg.m-2)
+      REAL,ALLOCATABLE :: perennial_co2_old_slope(:,:) ! Surface water ice (kg.m-2)
       REAL,ALLOCATABLE :: tsoil_old_slope(:,:,:) 
       REAL,ALLOCATABLE :: inertiesoil_old_slope(:,:,:) 
@@ -445 +445 @@
      &   date,tsurf,tsoil,inertiesoil,albedo,emis,q2,
      &   t,ucov,vcov,ps,teta,phisold_newgrid,q,qsurf,
-     &   tauscaling,totcloudfrac,surfith,nid,watercap,perenial_co2ice)
+     &   tauscaling,totcloudfrac,surfith,nid,watercap,perennial_co2ice)
         write(*,*) "OK, read start_archive file"
         ! copy soil thermal inertia
@@ -467 +467 @@
      &        nqsoil,day_ini,time,tsurf,tsoil,albedo,emis,
      &        q2,qsurf,qsoil,tauscaling,totcloudfrac,
-     &        wstar,watercap,perenial_co2ice,
+     &        wstar,watercap,perennial_co2ice,
      &        def_slope,def_slope_mean,subslope_dist)
         
@@ -1804 +1804 @@
         allocate(emis_old_slope(ngridmx,nslope_old))    
         allocate(watercap_old_slope(ngridmx,nslope_old)) 
-        allocate(perenial_co2_old_slope(ngridmx,nslope_old)) 
+        allocate(perennial_co2_old_slope(ngridmx,nslope_old)) 
 
 
@@ -1811 +1811 @@
         emis_old_slope(:,:)=emis(:,:)
         watercap_old_slope(:,:)=watercap(:,:)
-        perenial_co2_old_slope(:,:) = perenial_co2ice(:,:)
+        perennial_co2_old_slope(:,:) = perennial_co2ice(:,:)
         call end_surfdat_h_slope_var
         call ini_surfdat_h_slope_var(ngridmx,nqtot,nslope_new)
@@ -1842 +1842 @@
              emis(:,islope)=emis_old_slope(:,1)
              watercap(:,islope)=watercap_old_slope(:,1)
-             perenial_co2ice(:,islope)= perenial_co2_old_slope(:,1)
+             perennial_co2ice(:,islope)= perennial_co2_old_slope(:,1)
              tsoil(:,:,islope)=tsoil_old_slope(:,:,1)
              albedo(:,:,islope)=albedo_old_slope(:,:,1)
@@ -1853 +1853 @@
              emis(:,1)=emis_old_slope(:,iflat)
              watercap(:,1)=watercap_old_slope(:,iflat)
-             perenial_co2ice(:,islope)= perenial_co2_old_slope(:,iflat)
+             perennial_co2ice(:,islope)= 
+     &                 perennial_co2_old_slope(:,iflat)
              tsoil(:,:,1)=tsoil_old_slope(:,:,iflat)
              albedo(:,:,1)=albedo_old_slope(:,:,iflat)
@@ -1864 +1865 @@
              emis(:,islope)=emis_old_slope(:,iflat)
              watercap(:,islope)=watercap_old_slope(:,iflat)
-             perenial_co2ice(:,islope)= perenial_co2_old_slope(:,iflat)
+             perennial_co2ice(:,islope)= 
+     &                 perennial_co2_old_slope(:,iflat)
              tsoil(:,:,islope)=tsoil_old_slope(:,:,iflat)
              albedo(:,:,islope)=albedo_old_slope(:,:,iflat)
@@ -1876 +1878 @@
              emis(:,islope)=emis_old_slope(:,iflat)
              watercap(:,islope)=watercap_old_slope(:,iflat)
-             perenial_co2ice(:,islope)= perenial_co2_old_slope(:,iflat)
+             perennial_co2ice(:,islope)= 
+     &                 perennial_co2_old_slope(:,iflat)
              tsoil(:,:,islope)=tsoil_old_slope(:,:,iflat)
              albedo(:,:,islope)=albedo_old_slope(:,:,iflat)
@@ -2012 +2015 @@
      &              emis,q2,qsurf,qsoil,
      &              tauscaling,totcloudfrac,wstar,watercap,
-     &              perenial_co2ice)
+     &              perennial_co2ice)
 
 c=======================================================================

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

@@ -68 +68 @@
       REAL,ALLOCATABLE :: tsoil(:,:,:) ! Soil temperature
       REAL,ALLOCATABLE :: watercap(:,:)        ! h2o ice layer
-      REAL,ALLOCATABLE :: perenial_co2ice(:,:) ! co2 ice layer
+      REAL,ALLOCATABLE :: perennial_co2ice(:,:) ! co2 ice layer
       REAL :: tauscaling(ngridmx) ! dust conversion factor
       REAL:: totcloudfrac(ngridmx) ! sub-grid cloud fraction
@@ -88 +88 @@
       REAL ithS(ip1jmp1,nsoilmx) ! Soil Thermal Inertia for inertie dat (present day climate)
       REAL,ALLOCATABLE :: watercapS(:,:)
-      REAL,ALLOCATABLE :: perenial_co2iceS(:,:)
+      REAL,ALLOCATABLE :: perennial_co2iceS(:,:)
       REAL,ALLOCATABLE :: watercaptag_tmp(:)
       REAL,ALLOCATABLE :: watercaptagS(:)
@@ -172 +172 @@
       allocate(tsoil(ngridmx,nsoilmx,nslope))
       allocate(watercap(ngridmx,nslope))
-      allocate(perenial_co2ice(ngridmx,nslope))
+      allocate(perennial_co2ice(ngridmx,nslope))
       allocate(emis(ngridmx,nslope))
       allocate(albedo(ngridmx,2,nslope))
@@ -181 +181 @@
       allocate(inertiesoilS(ip1jmp1,nsoilmx,nslope))
       allocate(watercapS(ip1jmp1,nslope))
-      allocate(perenial_co2iceS(ip1jmp1,nslope))
+      allocate(perennial_co2iceS(ip1jmp1,nslope))
       allocate(watercaptagS(ip1jmp1))
       allocate(emisS(ip1jmp1,nslope))
@@ -189 +189 @@
       CALL phyetat0(fichnom,0,Lmodif,nsoilmx,ngridmx,llm,nqtot,nqsoil,
      &      day_ini_fi,timefi,tsurf,tsoil,albedo,emis,q2,qsurf,qsoil,
-     &      tauscaling,totcloudfrac,wstar,watercap,perenial_co2ice,
+     &      tauscaling,totcloudfrac,wstar,watercap,perennial_co2ice,
      &      def_slope, def_slope_mean,subslope_dist)
 
@@ -275 +275 @@
 c tsurf --> tsurfS
 c watercap --> watercapS
-c perenial_co2ice --> perenial_co2iceS
+c perennial_co2ice --> perennial_co2iceS
 c tsoil --> tsoilS
 c inertiesoil --> inertiesoilS
@@ -293 +293 @@
       call gr_fi_dyn(1,ngridmx,iip1,jjp1,watercap(:,islope),
      &    watercapS(:,islope))
-      call gr_fi_dyn(1,ngridmx,iip1,jjp1,perenial_co2ice(:,islope),
-     &    perenial_co2iceS(:,islope))
+      call gr_fi_dyn(1,ngridmx,iip1,jjp1,perennial_co2ice(:,islope),
+     &    perennial_co2iceS(:,islope))
       call gr_fi_dyn(nsoilmx,ngridmx,iip1,jjp1,tsoil(:,:,islope),
      &    tsoilS(:,:,islope))
@@ -425 +425 @@
       call write_archive(nid,ntime,'watercap','couche de glace h2o',
      &  'kg/m2',2,watercapS)
-      call write_archive(nid,ntime,'perenial_co2ice',
-     &'couche de glace co2','kg/m2',2,perenial_co2iceS)
+      call write_archive(nid,ntime,'perennial_co2ice',
+     &'couche de glace co2','kg/m2',2,perennial_co2iceS)
       call write_archive(nid,ntime,'watercaptag','couche de glace h2o',
      &  'kg/m2',2,watercaptagS)

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

@@ -69 +69 @@
       REAL,ALLOCATABLE :: tsoil(:,:,:) ! Soil temperature
       REAL,ALLOCATABLE :: watercap(:,:)        ! h2o ice layer
-      REAL,ALLOCATABLE :: perenial_co2ice(:,:)        ! co2 ice layer
+      REAL,ALLOCATABLE :: perennial_co2ice(:,:)        ! co2 ice layer
       REAL tauscaling(ngridmx) ! dust conversion factor
       REAL totcloudfrac(ngridmx) ! sub-grid cloud fraction
@@ -92 +92 @@
       REAL ithS(ip1jmp1,nsoilmx) ! Soil Thermal Inertia for inertie dat (present day climate)
       REAL,ALLOCATABLE :: watercapS(:,:)
-      REAL,ALLOCATABLE :: perenial_co2iceS(:,:)        ! co2 ice layer
+      REAL,ALLOCATABLE :: perennial_co2iceS(:,:)        ! co2 ice layer
       REAL tauscalingS(ip1jmp1)
       REAL totcloudfracS(ip1jmp1)
@@ -186 +186 @@
       allocate(tsoil(ngridmx,nsoilmx,nslope))
       allocate(watercap(ngridmx,nslope))
-      allocate(perenial_co2ice(ngridmx,nslope))
+      allocate(perennial_co2ice(ngridmx,nslope))
       allocate(emis(ngridmx,nslope))
       allocate(albedo(ngridmx,2,nslope))
@@ -195 +195 @@
       allocate(inertiesoilS(ip1jmp1,nsoilmx,nslope))
       allocate(watercapS(ip1jmp1,nslope))
-      allocate(perenial_co2iceS(ngridmx,nslope))
+      allocate(perennial_co2iceS(ngridmx,nslope))
       allocate(emisS(ip1jmp1,nslope))
       allocate(albedoS(ip1jmp1,nslope))
@@ -202 +202 @@
       CALL phyetat0 (fichnom,0,Lmodif,nsoilmx,ngridmx,llm,nqtot,
      &      day_ini_fi,timefi,tsurf,tsoil,albedo,emis,q2,qsurf,
-     &      tauscaling,totcloudfrac,wstar,watercap,perenial_co2ice,
+     &      tauscaling,totcloudfrac,wstar,watercap,perennial_co2ice,
      &      def_slope,def_slope_mean,subslope_dist)
 
@@ -300 +300 @@
       call gr_fi_dyn(1,ngridmx,iip1,jjp1,watercap(:,islope),
      &    watercapS(:,islope))
-      call gr_fi_dyn(1,ngridmx,iip1,jjp1,perenial_co2ice(:,islope),
-     &    perenial_co2iceS(:,islope))
+      call gr_fi_dyn(1,ngridmx,iip1,jjp1,perennial_co2ice(:,islope),
+     &    perennial_co2iceS(:,islope))
       call gr_fi_dyn(nsoilmx,ngridmx,iip1,jjp1,tsoil(:,:,islope),
      &    tsoilS(:,:,islope))
@@ -433 +433 @@
       call write_archive(nid,ntime,'watercap','couche de glace h2o',
      &  'kg/m2',2,watercapS)
-      call write_archive(nid,ntime,'perenial_co2ice','couche de glace co2',
-     &  'kg/m2',2,perenial_co2iceS)
+      call write_archive(nid,ntime,'perennial_co2ice','couche de glace co2',
+     &  'kg/m2',2,perennial_co2iceS)
       call write_archive(nid,ntime,'tauscaling',
      &  'dust conversion factor',' ',2,tauscalingS)